[Git][ghc/ghc][wip/9.12.1-alpha1] 2 commits: testsuite: normalise windows file seperators

[Zubin (@wz1000)]

Zubin pushed to branch wip/9.12.1-alpha1 at Glasgow Haskell Compiler / GHC


Commits:
418adce4 by Zubin Duggal at 2024-10-15T03:07:37+05:30
testsuite: normalise windows file seperators

- - - - -
193d7c0e by Zubin Duggal at 2024-10-15T03:07:37+05:30
Prepare 9.12.1 alpha

- - - - -


3 changed files:

- configure.ac
- testsuite/tests/ghc-e/should_fail/T9930fail.stderr
- testsuite/tests/profiling/should_run/all.T


Changes:

=====================================
configure.ac
=====================================
@@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12], [glasgow-hask
 AC_CONFIG_MACRO_DIRS([m4])
 
 # Set this to YES for a released version, otherwise NO
-: ${RELEASE=YES}
+: ${RELEASE=NO}
 
 # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
 # above.  If this is not a released version, then we will append the


=====================================
testsuite/tests/ghc-e/should_fail/T9930fail.stderr
=====================================
@@ -3,46 +3,46 @@ ghc: Exception:
 default output name would overwrite the input file; must specify -o explicitly
 Usage: For basic information, try the `--help' option.
 
-Package: ghc-9.11-inplace
+Package: ghc-9.12-8fe2
 Module: GHC.Utils.Panic
 Type: GhcException
 
 While handling default output name would overwrite the input file; must specify -o explicitly
   | Usage: For basic information, try the `--help' option.
   |
-  | Package: ghc-9.11-inplace
+  | Package: ghc-9.12-8fe2
   | Module: GHC.Utils.Panic
   | Type: GhcException
   |
   | While handling default output name would overwrite the input file; must specify -o explicitly
   |   | Usage: For basic information, try the `--help' option.
   |   |
-  |   | Package: ghc-9.11-inplace
+  |   | Package: ghc-9.12-8fe2
   |   | Module: GHC.Utils.Panic
   |   | Type: GhcException
   |   |
   |   | While handling default output name would overwrite the input file; must specify -o explicitly
   |   |   | Usage: For basic information, try the `--help' option.
   |   |   |
-  |   |   | Package: ghc-9.11-inplace
+  |   |   | Package: ghc-9.12-8fe2
   |   |   | Module: GHC.Utils.Panic
   |   |   | Type: GhcException
   |   |   |
   |   |   | HasCallStack backtrace:
-  |   |   |   collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
-  |   |   |   toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:84:32 in ghc-internal:GHC.Internal.Exception
-  |   |   |   throw, called at compiler/GHC/Utils/Panic.hs:180:21 in ghc-9.11-inplace:GHC.Utils.Panic
+  |   |   |   collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
+  |   |   |   toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception
+  |   |   |   throw, called at compiler/GHC/Utils/Panic.hs:180:21 in ghc-9.12-8fe2:GHC.Utils.Panic
   |   |
   |   | HasCallStack backtrace:
-  |   |   bracket_, called at libraries/semaphore-compat/src/System/Semaphore.hs:320:23 in semaphore-compat-1.0.0-inplace:System.Semaphore
+  |   |   bracket_, called at libraries/semaphore-compat/src/System/Semaphore.hs:320:23 in semaphore-compat-1.0.0-c856:System.Semaphore
   |
   | HasCallStack backtrace:
-  |   collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
+  |   collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
   |   toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:284:11 in ghc-internal:GHC.Internal.IO
-  |   throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:371:12 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  |   throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:860:84 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  |   onException, called at compiler/GHC/Driver/Make.hs:2986:23 in ghc-9.11-inplace:GHC.Driver.Make
+  |   throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:371:12 in exceptions-0.10.7-71b0:Control.Monad.Catch
+  |   throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:860:84 in exceptions-0.10.7-71b0:Control.Monad.Catch
+  |   onException, called at compiler/GHC/Driver/Make.hs:2988:23 in ghc-9.12-8fe2:GHC.Driver.Make
 
 HasCallStack backtrace:
-  bracket, called at compiler/GHC/Driver/Make.hs:2953:3 in ghc-9.11-inplace:GHC.Driver.Make
+  bracket, called at compiler/GHC/Driver/Make.hs:2955:3 in ghc-9.12-8fe2:GHC.Driver.Make
 


=====================================
testsuite/tests/profiling/should_run/all.T
=====================================
@@ -145,11 +145,13 @@ test('T7275', test_opts_dot_prof, makefile_test, [])
 test('callstack001',
      # unoptimised results are different w.r.t. CAF attribution
      [test_opts_dot_prof # produces a different stack
+     ,normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s))
      ], compile_and_run,
      ['-fprof-auto-calls -fno-full-laziness -fno-state-hack'])
 
 test('callstack002',
      [ test_opts_dot_prof # produces a different stack
+     , normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s))
      ],
      compile_and_run,
      ['-fprof-auto-calls -fno-full-laziness -fno-state-hack'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3402878536e6f00a714db559d9f953c222eb814b...193d7c0e673e04576686c69b875823501c587816

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3402878536e6f00a714db559d9f953c222eb814b...193d7c0e673e04576686c69b875823501c587816
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241014/16b44f67/attachment-0001.html>