[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Document ghc package's PVP-noncompliance

Marge Bot (@marge-bot) gitlab at gitlab.haskell.org
Thu Dec 14 07:21:00 UTC 2023



Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
e39e9b8f by Bryan Richter at 2023-12-14T02:20:46-05:00
Document ghc package's PVP-noncompliance

This changes nothing, it just makes the status quo explicit.

- - - - -
31360c80 by Luite Stegeman at 2023-12-14T02:20:48-05:00
JS: Mark spurious CI failures js_fragile(24259)

This marks the spurious test failures on the JS platform as
js_fragile(24259), so we don't hold up merge requests while
fixing the underlying issues.

See #24259

- - - - -


10 changed files:

- compiler/ghc.cabal.in
- libraries/base/tests/all.T
- testsuite/driver/testlib.py
- testsuite/tests/backpack/cabal/T20509/all.T
- testsuite/tests/backpack/cabal/bkpcabal02/all.T
- testsuite/tests/backpack/cabal/bkpcabal03/all.T
- testsuite/tests/concurrent/should_run/all.T
- testsuite/tests/ghc-api/downsweep/all.T
- testsuite/tests/numeric/should_run/all.T
- testsuite/tests/rts/all.T


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -20,6 +20,11 @@ Description:
     .
     See <https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/compiler>
     for more information.
+    .
+    __This package is not PVP-compliant.__
+    .
+    This package directly exposes GHC internals, which can and do change with
+    every release.
 Category: Development
 Build-Type: Custom
 


=====================================
libraries/base/tests/all.T
=====================================
@@ -309,7 +309,7 @@ test('listThreads', normal, compile_and_run, [''])
 test('listThreads1', omit_ghci, compile_and_run, [''])
 test('inits1tails1', normal, compile_and_run, [''])
 test('CLC149', normal, compile, [''])
-test('AtomicModifyIORef', normal, compile_and_run, [''])
+test('AtomicModifyIORef', js_fragile(24259), compile_and_run, [''])
 test('AtomicSwapIORef', normal, compile_and_run, [''])
 test('T23454', normal, compile_fail, [''])
 test('T23687', normal, compile_and_run, [''])


=====================================
testsuite/driver/testlib.py
=====================================
@@ -153,6 +153,13 @@ def js_broken( bug: IssueNumber ):
     else:
         return normal;
 
+# expect occasional failures for the JS backend
+def js_fragile( bug: IssueNumber ):
+    if js_arch():
+        return fragile(bug);
+    else:
+        return normal;
+
 def expect_fail( name, opts ):
     # The compiler, testdriver, OS or platform is missing a certain
     # feature, and we don't plan to or can't fix it now or in the


=====================================
testsuite/tests/backpack/cabal/T20509/all.T
=====================================
@@ -1,6 +1,7 @@
 test('T20509',
      [extra_files(['p', 'q', 'T20509.cabal', 'Setup.hs'])
      , run_timeout_multiplier(2)
+     , js_fragile(24259)
      ],
      makefile_test,
      [])


=====================================
testsuite/tests/backpack/cabal/bkpcabal02/all.T
=====================================
@@ -1,5 +1,6 @@
 test('bkpcabal02',
      [extra_files(['p', 'q', 'bkpcabal02.cabal', 'Setup.hs']),
-      normalise_version('bkpcabal01')],
+      normalise_version('bkpcabal01'),
+      js_fragile(24259)],
      makefile_test,
      [])


=====================================
testsuite/tests/backpack/cabal/bkpcabal03/all.T
=====================================
@@ -1,4 +1,5 @@
 test('bkpcabal03',
-     [extra_files(['asig1', 'asig2', 'bkpcabal03.cabal.in1', 'bkpcabal03.cabal.in2', 'Setup.hs', 'Mod.hs'])],
+     [extra_files(['asig1', 'asig2', 'bkpcabal03.cabal.in1', 'bkpcabal03.cabal.in2', 'Setup.hs', 'Mod.hs']),
+      js_fragile(24259)],
      makefile_test,
      [])


=====================================
testsuite/tests/concurrent/should_run/all.T
=====================================
@@ -47,7 +47,7 @@ test('T3429', [ extra_run_opts('+RTS -C0.001 -RTS'),
 # times out with ghci
 test('T4030', omit_ghci, compile_and_run, ['-O'])
 
-test('throwto002', normal, compile_and_run, [''])
+test('throwto002', js_fragile(24259), compile_and_run, [''])
 test('throwto003', normal, compile_and_run, [''])
 
 test('mask001', normal, compile_and_run, [''])


=====================================
testsuite/tests/ghc-api/downsweep/all.T
=====================================
@@ -3,6 +3,7 @@ setTestOpts(when(arch('wasm32'), run_timeout_multiplier(2)))
 test('PartialDownsweep',
      [ extra_run_opts('"' + config.libdir + '"')
      , ignore_stderr
+     , js_fragile(24259)
      ],
      compile_and_run,
      ['-package ghc -package exceptions'])


=====================================
testsuite/tests/numeric/should_run/all.T
=====================================
@@ -79,6 +79,6 @@ test('IntegerToFloat', normal, compile_and_run, [''])
 
 test('T20291', normal, compile_and_run, [''])
 test('T22282', normal, compile_and_run, [''])
-test('T22671', normal, compile_and_run, [''])
-test('foundation', [when(js_arch(), run_timeout_multiplier(2))], compile_and_run, ['-O -package transformers'])
+test('T22671', js_fragile(24259), compile_and_run, [''])
+test('foundation', [when(js_arch(), run_timeout_multiplier(2)), js_fragile(24259)], compile_and_run, ['-O -package transformers'])
 test('T24066', normal, compile_and_run, [''])


=====================================
testsuite/tests/rts/all.T
=====================================
@@ -302,6 +302,7 @@ test('T7919', [ when(fast(), skip)
               , omit_ghci
               , req_th
               , when(platform('x86_64-unknown-linux'), fragile(22283))
+              , js_fragile(24259)
               ]
               , compile_and_run, [config.ghc_th_way_flags])
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0de9319433e80ae05fe83229fc061052dea1b3f8...31360c805ea46423f3db0f7287bb2d4225f06d5b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0de9319433e80ae05fe83229fc061052dea1b3f8...31360c805ea46423f3db0f7287bb2d4225f06d5b
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/20231214/398f6a89/attachment-0001.html>


More information about the ghc-commits mailing list