[Git][ghc/ghc][wip/backports-9.8-2] 2 commits: Bump process submodule to v1.6.25.0

Ben Gamari (@bgamari) gitlab at gitlab.haskell.org
Sat Oct 12 15:55:40 UTC 2024


Ben Gamari pushed to branch wip/backports-9.8-2 at Glasgow Haskell Compiler / GHC


Commits:
2eb97a8c by Ben Gamari at 2024-10-12T11:39:11-04:00
Bump process submodule to v1.6.25.0

(cherry picked from commit 18f532f3ed021fff9529f50da2006b8a8d8b1df7)

- - - - -
20157588 by Ben Gamari at 2024-10-12T11:39:11-04:00
testsuite: Tests broken due to #22349 are fixed

- - - - -


6 changed files:

- libraries/process
- testsuite/tests/driver/T1372/all.T
- testsuite/tests/driver/recomp007/all.T
- testsuite/tests/patsyn/should_compile/T13350/all.T
- testsuite/tests/safeHaskell/check/pkg01/all.T
- testsuite/tests/typecheck/bug1465/all.T


Changes:

=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit 3466b14dacddc4628427c4d787482899dd0b17cd
+Subproject commit b8c88fb5bbdebbcbb3e7c734f0c7515dd3cef84e


=====================================
testsuite/tests/driver/T1372/all.T
=====================================
@@ -1 +1 @@
-test('T1372', [extra_files(['p1/', 'p2/']), js_broken(22349)], makefile_test, ['T1372'])
+test('T1372', [extra_files(['p1/', 'p2/'])], makefile_test, ['T1372'])


=====================================
testsuite/tests/driver/recomp007/all.T
=====================================
@@ -5,5 +5,4 @@
 test('recomp007', [ extra_files(['Setup.hs', 'a1/', 'a2/', 'b/'])
                   , when(fast(), skip)
                   , normalise_slashes
-                  , js_broken(22349)
                   ], makefile_test, [])


=====================================
testsuite/tests/patsyn/should_compile/T13350/all.T
=====================================
@@ -1,6 +1,5 @@
 # Test that importing COMPLETE sets from external packages works
 
 test('T13350',
-     [extra_files(['T13350.hs', 'boolean']),
-     js_broken(22349)],
+     [extra_files(['T13350.hs', 'boolean'])],
      makefile_test, ['T13350'])


=====================================
testsuite/tests/safeHaskell/check/pkg01/all.T
=====================================
@@ -53,16 +53,14 @@ test('ImpSafe03',
 test('ImpSafe04', normalise_version('base'), compile_fail, ['-fpackage-trust -distrust base'])
 
 test('ImpSafeOnly01',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly01 ' + make_args)],
      compile,
      ['-fpackage-trust -package-db pdb.ImpSafeOnly01/local.db -trust base'])
 
 test('ImpSafeOnly02',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly02 ' + make_args)],
      compile,
@@ -70,8 +68,7 @@ test('ImpSafeOnly02',
 
 # Fail since we enable package trust (and still need safePkg01 trusted)
 test('ImpSafeOnly03',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly03 ' + make_args)],
      compile_fail,
@@ -79,23 +76,20 @@ test('ImpSafeOnly03',
 
 # Succeed since we don't enable package trust
 test('ImpSafeOnly04',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly04 ' + make_args)],
      compile, ['-package-db pdb.ImpSafeOnly04/local.db -trust base'])
 
 # fail due to missing trust of safePkg01, next test succeeds.
 test('ImpSafeOnly05',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly05 ' + make_args)],
      compile_fail,
      ['-fpackage-trust -package-db pdb.ImpSafeOnly05/local.db -trust base'])
 test('ImpSafeOnly06',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly06 ' + make_args)],
      compile,
@@ -103,24 +97,21 @@ test('ImpSafeOnly06',
 
 # fail due to missing trust
 test('ImpSafeOnly07',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly07 ' + make_args),
       normalise_version("bytestring", "base")],
      compile_fail,
      ['-fpackage-trust -package-db pdb.ImpSafeOnly07/local.db -trust safePkg01 -distrust bytestring'])
 test('ImpSafeOnly08',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly08 ' + make_args),
       normalise_version("bytestring", "base")],
      compile_fail,
      ['-fpackage-trust -package-db pdb.ImpSafeOnly08/local.db -trust safePkg01'])
 test('ImpSafeOnly09',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly09 ' + make_args),
       normalise_version("bytestring")],
@@ -129,8 +120,7 @@ test('ImpSafeOnly09',
 
 # finally succeed
 test('ImpSafeOnly10',
-     [js_broken(22349),
-      req_host_target_ghc,
+     [req_host_target_ghc,
       extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
       pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly10 ' + make_args)],
      compile,


=====================================
testsuite/tests/typecheck/bug1465/all.T
=====================================
@@ -1 +1 @@
-test('bug1465', [extra_files(['B1.hs', 'B2.hs', 'C.hs', 'v1/', 'v2/']), js_broken(22349)], makefile_test, [])
+test('bug1465', [extra_files(['B1.hs', 'B2.hs', 'C.hs', 'v1/', 'v2/'])], makefile_test, [])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54a48fa8e9a8a226cb7d2661758b27be6a74594f...2015758896e9c163e6b6952142556dc1838c02ba

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54a48fa8e9a8a226cb7d2661758b27be6a74594f...2015758896e9c163e6b6952142556dc1838c02ba
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/20241012/ad039acb/attachment-0001.html>


More information about the ghc-commits mailing list