diff options
| -rw-r--r-- | testsuite/driver/testlib.py | 1 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib/integer/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/programs/barton-mangler-bug/test.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/all.T | 2 | ||||
| -rwxr-xr-x | testsuite/tests/typecheck/should_run/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/utils/should_run/all.T | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 7284b80380..442d90da8a 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -274,6 +274,7 @@ def omit_ways( ways ): return lambda name, opts, w=ways: _omit_ways( name, opts, w ) def _omit_ways( name, opts, ways ): + assert ways.__class__ is list opts.omit_ways += ways # ----- diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 4e60a1dcdf..10d8424c87 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/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']), diff --git a/testsuite/tests/lib/integer/all.T b/testsuite/tests/lib/integer/all.T index 5e629b95df..97065a3341 100644 --- a/testsuite/tests/lib/integer/all.T +++ b/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']) diff --git a/testsuite/tests/programs/barton-mangler-bug/test.T b/testsuite/tests/programs/barton-mangler-bug/test.T index dcccf8e758..8258106906 100644 --- a/testsuite/tests/programs/barton-mangler-bug/test.T +++ b/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', '']) diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 3c7afc0b1c..173ed7c601 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -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, ['']) diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T index 54d5ae4083..598d467b7e 100755 --- a/testsuite/tests/typecheck/should_run/all.T +++ b/testsuite/tests/typecheck/should_run/all.T @@ -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']) diff --git a/testsuite/tests/utils/should_run/all.T b/testsuite/tests/utils/should_run/all.T index 8817118601..e2ae0f9a78 100644 --- a/testsuite/tests/utils/should_run/all.T +++ b/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, |