[Git][ghc/ghc][wip/slowtest] 2 commits: testsuite: Skip T7919 in ghci way

[Ben Gamari]

Ben Gamari pushed to branch wip/slowtest at Glasgow Haskell Compiler / GHC


Commits:
4cd2f07c by Ben Gamari at 2019-04-06T16:12:23Z
testsuite: Skip T7919 in ghci way

It times out pretty reliably. It's not clear that much is gained by
running this test in the ghci way anyways.

- - - - -
1df9027e by Ben Gamari at 2019-04-06T16:12:23Z
testsuite: Fix fragile_for test modifier

- - - - -


2 changed files:

- testsuite/driver/testlib.py
- testsuite/tests/rts/all.T


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -258,14 +258,14 @@ def fragile( bug ):
 
     return helper
 
-def fragile_for( name, opts, bug, ways ):
+def fragile_for( bug, ways ):
     """
     Indicates that the test should be skipped due to fragility in the given
     test ways as documented in the given ticket.
     """
     def helper( name, opts, bug=bug, ways=ways ):
         record_broken(name, opts, bug)
-        opts.omit_ways = ways
+        opts.omit_ways += ways
 
     return helper
 
@@ -275,7 +275,7 @@ def omit_ways( ways ):
     return lambda name, opts, w=ways: _omit_ways( name, opts, w )
 
 def _omit_ways( name, opts, ways ):
-    opts.omit_ways = ways
+    opts.omit_ways += ways
 
 # -----
 


=====================================
testsuite/tests/rts/all.T
=====================================
@@ -272,7 +272,8 @@ test('T7815', [ multi_cpu_race,
 test('ffishutdown', [ignore_stderr, only_ways(['threaded1','threaded2'])],
      compile_and_run, [''])
 
-test('T7919', [when(fast(), skip), omit_ways(prof_ways)], compile_and_run,
+# Times out in ghci way
+test('T7919', [when(fast(), skip), omit_ways(['ghci'] + prof_ways)], compile_and_run,
      [config.ghc_th_way_flags])
 
 test('T8035', normal, compile_and_run, [''])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4ee82fe1c4fbdef48b7abc5c830223d9e7d38e52...1df9027ede31ff1e591c5002914dd4f7f01ba72c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4ee82fe1c4fbdef48b7abc5c830223d9e7d38e52...1df9027ede31ff1e591c5002914dd4f7f01ba72c
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/20190406/d840124c/attachment-0001.html>