[Git][ghc/ghc][wip/slowtest] 10 commits: testsuite: Mark T16180 as broken in ghci and ext-interp ways
Ben Gamari
gitlab at gitlab.haskell.org
Mon Apr 8 00:53:26 UTC 2019
Ben Gamari pushed to branch wip/slowtest at Glasgow Haskell Compiler / GHC
Commits:
e211572f by Ben Gamari at 2019-04-08T00:53:13Z
testsuite: Mark T16180 as broken in ghci and ext-interp ways
As noted in #16541.
- - - - -
913d2f00 by Ben Gamari at 2019-04-08T00:53:13Z
testsuite: Omit tcrun022 in hpc way
As noted in #16542, the expected rule doesn't fire. However, this
doesn't seem terribly surpring given the circumstances.
- - - - -
f9bc88fe by Ben Gamari at 2019-04-08T00:53:13Z
testsuite: Mark Overflow as broken in hpc way
As noted in #16543.
- - - - -
2ed06d21 by Ben Gamari at 2019-04-08T00:53:13Z
testsuite: Mark closure_size as broken in threaded2, optasm, dyn ways
As noted in #16531.
- - - - -
20919605 by Ben Gamari at 2019-04-08T00:53:13Z
testsuite: Mark T2783 as fragile in threaded1
It was previously marked as broken but it passes non-deterministically.
See #2783.
- - - - -
e7a18a49 by Ben Gamari at 2019-04-08T00:53:13Z
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.
- - - - -
3a67d460 by Ben Gamari at 2019-04-08T00:53:13Z
testsuite: Fix fragile_for test modifier
- - - - -
c1391f20 by Ben Gamari at 2019-04-08T00:53:13Z
users-guide: Add pretty to package list
- - - - -
2e8a4874 by Ben Gamari at 2019-04-08T00:53:14Z
Bump unix submodule
Marks posix002 as fragile in threaded2 way due to #16550.
- - - - -
1202085b by Ben Gamari at 2019-04-08T00:53:14Z
testsuite: Fix omit_ways usage
omit_ways expects a list but this was broken in several cases.
- - - - -
12 changed files:
- docs/users_guide/8.8.1-notes.rst
- libraries/ghc-heap/tests/all.T
- libraries/unix
- testsuite/driver/testlib.py
- testsuite/tests/concurrent/should_run/all.T
- testsuite/tests/lib/integer/all.T
- testsuite/tests/programs/barton-mangler-bug/test.T
- testsuite/tests/rts/all.T
- testsuite/tests/th/all.T
- testsuite/tests/typecheck/should_run/all.T
- testsuite/tests/utils/should_run/all.T
- testsuite/tests/warnings/should_compile/all.T
Changes:
=====================================
docs/users_guide/8.8.1-notes.rst
=====================================
@@ -212,6 +212,7 @@ for further change information.
libraries/libiserv/libiserv.cabal: Internal compiler library
libraries/mtl/mtl.cabal: Dependency of ``Cabal`` library
libraries/parsec/parsec.cabal: Dependency of ``Cabal`` library
+ libraries/pretty/pretty.cabal: Dependency of ``ghc`` library
libraries/process/process.cabal: Dependency of ``ghc`` library
libraries/stm/stm.cabal: Dependency of ``haskeline`` library
libraries/template-haskell/template-haskell.cabal: Core library
=====================================
libraries/ghc-heap/tests/all.T
=====================================
@@ -7,5 +7,5 @@ test('heap_all',
],
compile_and_run, [''])
test('closure_size',
- omit_ways(['ghci', 'hpc', 'prof']),
+ [omit_ways(['ghci', 'hpc', 'prof']), expect_broken_for(16544, ['dyn', 'optasm', 'threaded2'])],
compile_and_run, [''])
=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit a102df29c107e8f853129dd40fbbb487e1818149
+Subproject commit a67b5e9e70a2a0c438d4f186fda9f38409ff1435
=====================================
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,8 @@ 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
+ assert ways.__class__ is list
+ opts.omit_ways += ways
# -----
=====================================
testsuite/tests/concurrent/should_run/all.T
=====================================
@@ -239,7 +239,7 @@ test('conc067', ignore_stdout, compile_and_run, [''])
# omit threaded2, the behaviour of this test is non-deterministic with more
# than one CPU.
-test('conc068', [ omit_ways('threaded2'), exit_code(1) ], compile_and_run, [''])
+test('conc068', [ omit_ways(['threaded2']), exit_code(1) ], compile_and_run, [''])
test('setnumcapabilities001',
[ only_ways(['threaded1','threaded2']),
=====================================
testsuite/tests/lib/integer/all.T
=====================================
@@ -1,8 +1,8 @@
test('integerBits', normal, compile_and_run, [''])
test('integerConversions', normal, compile_and_run, [''])
# skip ghci as it doesn't support unboxed tuples
-test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, [''])
-test('plusMinusInteger', [omit_ways('ghci')], compile_and_run, [''])
+test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways(['ghci'])], compile_and_run, [''])
+test('plusMinusInteger', [omit_ways(['ghci'])], compile_and_run, [''])
test('integerConstantFolding', normal, makefile_test, ['integerConstantFolding'])
test('fromToInteger', [], makefile_test, ['fromToInteger'])
test('IntegerConversionRules', [], makefile_test, ['IntegerConversionRules'])
=====================================
testsuite/tests/programs/barton-mangler-bug/test.T
=====================================
@@ -8,7 +8,7 @@ test('barton-mangler-bug',
'Plot.hi', 'Plot.o',
'PlotExample.hi', 'PlotExample.o',
'TypesettingTricks.hi', 'TypesettingTricks.o']),
- omit_ways('debug') # Fails for debug way due to annotation linting timeout
+ omit_ways(['debug']) # Fails for debug way due to annotation linting timeout
],
multimod_compile_and_run, ['Main', ''])
=====================================
testsuite/tests/rts/all.T
=====================================
@@ -73,7 +73,7 @@ test('T2047', [ignore_stdout, extra_run_opts('+RTS -c -RTS')],
# Blackhole-detection test.
# Skip GHCi due to #2786
test('T2783', [ omit_ways(['ghci']), exit_code(1)
- , expect_broken_for(2783, ['threaded1'])
+ , fragile_for(2783, ['threaded1'])
], compile_and_run, [''])
# Test the work-stealing deque implementation. We run this test in
@@ -93,7 +93,7 @@ test('stack002', [extra_files(['stack001.hs']),
# run this test with very small stack chunks to exercise the stack
# overflow/underflow machinery.
-test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
+test('stack003', [ omit_ways(['ghci']), # uses unboxed tuples
extra_run_opts('500000 +RTS -kc1k -kb100 -K96m -RTS') ],
compile_and_run, [''])
@@ -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, [''])
=====================================
testsuite/tests/th/all.T
=====================================
@@ -467,7 +467,10 @@ test('T15437', expect_broken(15437), multimod_compile,
test('T15985', normal, compile, [''])
test('T16133', normal, compile_fail, [''])
test('T15471', normal, multimod_compile, ['T15471.hs', '-v0'])
-test('T16180', normal, compile_and_run, ['-package ghc'])
+test('T16180',
+ [when(llvm_build(), expect_broken_for(16541, ['ext-interp'])),
+ expect_broken_for(16541, ['ghci'])],
+ compile_and_run, ['-package ghc'])
test('T16183', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
test('T16195', normal, multimod_compile, ['T16195.hs', '-v0'])
test('T16293b', normal, compile, [''])
=====================================
testsuite/tests/typecheck/should_run/all.T
=====================================
@@ -35,7 +35,7 @@ test('tcrun018', normal, compile_and_run, [''])
test('tcrun019', normal, compile_and_run, [''])
test('tcrun020', normal, compile_and_run, [''])
test('tcrun021', normal, compile_and_run, ['-package containers'])
-test('tcrun022', omit_ways(['ghci']), compile_and_run, ['-O'])
+test('tcrun022', omit_ways(['hpc', 'ghci']), compile_and_run, ['-O'])
test('tcrun023', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, ['-O'])
test('tcrun024', normal, compile_and_run, ['-O'])
@@ -96,7 +96,7 @@ test('T6117', normal, compile_and_run, [''])
test('T5751', normal, compile_and_run, [''])
test('T5913', normal, compile_and_run, [''])
test('T7748', normal, compile_and_run, [''])
-test('T7861', [omit_ways('debug'), exit_code(1)], compile_and_run, [''])
+test('T7861', [omit_ways(['debug']), exit_code(1)], compile_and_run, [''])
test('TcTypeNatSimpleRun', normal, compile_and_run, [''])
test('TcTypeSymbolSimpleRun', normal, compile_and_run, [''])
test('T8119', normal, ghci_script, ['T8119.script'])
=====================================
testsuite/tests/utils/should_run/all.T
=====================================
@@ -1,6 +1,6 @@
test('T14854',
[only_ways(threaded_ways),
- omit_ways('ghci'),
+ omit_ways(['ghci']),
reqlib('random'),
ignore_stderr],
compile_and_run,
=====================================
testsuite/tests/warnings/should_compile/all.T
=====================================
@@ -25,4 +25,4 @@ test('MissingMod', normal, multimod_compile, ['MissingMod', '-Wmissing-home-modu
test('StarBinder', normal, compile, [''])
-test('Overflow', normal, compile, [''])
+test('Overflow', expect_broken_for(16543, ['hpc']), compile, [''])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/d7106e24e223cb38baf6dde90545a4208250591d...1202085b58db1608b5761b68fafe54d0fafe09be
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/d7106e24e223cb38baf6dde90545a4208250591d...1202085b58db1608b5761b68fafe54d0fafe09be
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/20190407/aa123028/attachment-0001.html>
More information about the ghc-commits
mailing list