summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/annotations/should_run/all.T2
-rw-r--r--testsuite/tests/array/should_run/all.T34
-rw-r--r--testsuite/tests/arrows/should_run/all.T4
-rw-r--r--testsuite/tests/concurrent/T2317/all.T2
-rw-r--r--testsuite/tests/concurrent/prog001/all.T2
-rw-r--r--testsuite/tests/concurrent/prog002/all.T2
-rw-r--r--testsuite/tests/concurrent/prog003/all.T2
-rw-r--r--testsuite/tests/concurrent/should_run/all.T4
-rw-r--r--testsuite/tests/deSugar/should_run/all.T4
-rw-r--r--testsuite/tests/deriving/should_run/all.T34
-rw-r--r--testsuite/tests/dph/diophantine/dph-diophantine.T2
-rw-r--r--testsuite/tests/dph/dotp/dph-dotp.T4
-rw-r--r--testsuite/tests/dph/nbody/dph-nbody.T4
-rw-r--r--testsuite/tests/dph/primespj/dph-primespj.T2
-rw-r--r--testsuite/tests/dph/quickhull/dph-quickhull.T4
-rw-r--r--testsuite/tests/dph/smvm/dph-smvm.T4
-rw-r--r--testsuite/tests/dph/words/dph-words.T4
-rw-r--r--testsuite/tests/driver/dynamic_flags_001/all.T2
-rw-r--r--testsuite/tests/driver/dynamic_flags_002/all.T16
-rw-r--r--testsuite/tests/driver/recomp001/all.T2
-rw-r--r--testsuite/tests/driver/recomp002/all.T2
-rw-r--r--testsuite/tests/driver/recomp005/all.T2
-rw-r--r--testsuite/tests/driver/recomp006/all.T3
-rw-r--r--testsuite/tests/driver/recomp007/all.T2
-rw-r--r--testsuite/tests/driver/recomp008/all.T2
-rw-r--r--testsuite/tests/ffi/should_run/all.T2
-rw-r--r--testsuite/tests/gadt/all.T12
-rw-r--r--testsuite/tests/ghc-api/T4891/all.T2
-rw-r--r--testsuite/tests/ghc-api/all.T2
-rw-r--r--testsuite/tests/ghc-api/apirecomp001/all.T5
-rwxr-xr-xtestsuite/tests/ghci/scripts/all.T2
-rw-r--r--testsuite/tests/programs/10queens/test.T2
-rw-r--r--testsuite/tests/programs/Queens/test.T2
-rw-r--r--testsuite/tests/programs/andre_monad/test.T2
-rw-r--r--testsuite/tests/programs/andy_cherry/test.T2
-rw-r--r--testsuite/tests/programs/barton-mangler-bug/test.T2
-rw-r--r--testsuite/tests/programs/cholewo-eval/test.T2
-rw-r--r--testsuite/tests/programs/cvh_unboxing/test.T2
-rw-r--r--testsuite/tests/programs/fast2haskell/test.T2
-rw-r--r--testsuite/tests/programs/fun_insts/test.T2
-rw-r--r--testsuite/tests/programs/galois_raytrace/test.T2
-rw-r--r--testsuite/tests/programs/jl_defaults/test.T2
-rw-r--r--testsuite/tests/programs/joao-circular/test.T2
-rw-r--r--testsuite/tests/programs/jq_readsPrec/test.T2
-rw-r--r--testsuite/tests/programs/jtod_circint/test.T2
-rw-r--r--testsuite/tests/programs/jules_xref/test.T2
-rw-r--r--testsuite/tests/programs/jules_xref2/test.T2
-rw-r--r--testsuite/tests/programs/launchbury/test.T2
-rw-r--r--testsuite/tests/programs/lennart_range/test.T2
-rw-r--r--testsuite/tests/programs/lex/test.T2
-rw-r--r--testsuite/tests/programs/life_space_leak/test.T2
-rw-r--r--testsuite/tests/programs/maessen-hashtab/test.T2
-rw-r--r--testsuite/tests/programs/north_array/test.T2
-rw-r--r--testsuite/tests/programs/okeefe_neural/test.T2
-rw-r--r--testsuite/tests/programs/record_upd/test.T2
-rw-r--r--testsuite/tests/programs/rittri/test.T2
-rw-r--r--testsuite/tests/programs/sanders_array/test.T2
-rw-r--r--testsuite/tests/programs/seward-space-leak/test.T2
-rw-r--r--testsuite/tests/programs/strict_anns/test.T2
-rw-r--r--testsuite/tests/programs/thurston-modular-arith/test.T2
-rw-r--r--testsuite/tests/quasiquotation/qq005/test.T2
-rw-r--r--testsuite/tests/quasiquotation/qq006/test.T2
-rw-r--r--testsuite/tests/quasiquotation/qq007/test.T2
-rw-r--r--testsuite/tests/quasiquotation/qq008/test.T2
-rw-r--r--testsuite/tests/rts/all.T2
-rw-r--r--testsuite/tests/simplCore/should_compile/all.T4
-rw-r--r--testsuite/tests/typecheck/prog001/test.T2
-rw-r--r--testsuite/tests/typecheck/prog002/test.T2
-rw-r--r--testsuite/tests/typecheck/testeq1/test.T2
69 files changed, 129 insertions, 119 deletions
diff --git a/testsuite/tests/annotations/should_run/all.T b/testsuite/tests/annotations/should_run/all.T
index 6616de5df4..444ac30912 100644
--- a/testsuite/tests/annotations/should_run/all.T
+++ b/testsuite/tests/annotations/should_run/all.T
@@ -1,6 +1,6 @@
setTestOpts(when(compiler_profiled(), skip))
# These tests are very slow due to their use of package GHC
-setTestOpts(skip_if_fast)
+setTestOpts(when(fast(), skip))
# Annotations, like Template Haskell, require runtime evaluation. In
# order for this to work with profiling, we would have to build the
diff --git a/testsuite/tests/array/should_run/all.T b/testsuite/tests/array/should_run/all.T
index eee3b123d2..a0cfc6be35 100644
--- a/testsuite/tests/array/should_run/all.T
+++ b/testsuite/tests/array/should_run/all.T
@@ -4,23 +4,23 @@
# extra run flags
# expected process return value, if not zero
-test('arr001', skip_if_fast, compile_and_run, [''])
-test('arr002', skip_if_fast, compile_and_run, [''])
-test('arr003', compose(skip_if_fast,exit_code(1)), compile_and_run, [''])
-test('arr004', compose(skip_if_fast,exit_code(1)), compile_and_run, [''])
-test('arr005', skip_if_fast, compile_and_run, [''])
-test('arr006', skip_if_fast, compile_and_run, [''])
-test('arr007', compose(skip_if_fast,exit_code(1)), compile_and_run, [''])
-test('arr008', compose(skip_if_fast,exit_code(1)), compile_and_run, [''])
-test('arr009', skip_if_fast, compile_and_run, [''])
-test('arr010', skip_if_fast, compile_and_run, [''])
-test('arr011', skip_if_fast, compile_and_run, [''])
-test('arr012', skip_if_fast, compile_and_run, [''])
-test('arr013', skip_if_fast, compile_and_run, [''])
-test('arr014', skip_if_fast, compile_and_run, [''])
-test('arr015', skip_if_fast, compile_and_run, [''])
+test('arr001', when(fast(), skip), compile_and_run, [''])
+test('arr002', when(fast(), skip), compile_and_run, [''])
+test('arr003', compose(when(fast(), skip),exit_code(1)), compile_and_run, [''])
+test('arr004', compose(when(fast(), skip),exit_code(1)), compile_and_run, [''])
+test('arr005', when(fast(), skip), compile_and_run, [''])
+test('arr006', when(fast(), skip), compile_and_run, [''])
+test('arr007', compose(when(fast(), skip),exit_code(1)), compile_and_run, [''])
+test('arr008', compose(when(fast(), skip),exit_code(1)), compile_and_run, [''])
+test('arr009', when(fast(), skip), compile_and_run, [''])
+test('arr010', when(fast(), skip), compile_and_run, [''])
+test('arr011', when(fast(), skip), compile_and_run, [''])
+test('arr012', when(fast(), skip), compile_and_run, [''])
+test('arr013', when(fast(), skip), compile_and_run, [''])
+test('arr014', when(fast(), skip), compile_and_run, [''])
+test('arr015', when(fast(), skip), compile_and_run, [''])
test('arr016', reqlib('random'), compile_and_run, [''])
-test('arr017', skip_if_fast, compile_and_run, [''])
-test('arr018', skip_if_fast, compile_and_run, [''])
+test('arr017', when(fast(), skip), compile_and_run, [''])
+test('arr018', when(fast(), skip), compile_and_run, [''])
test('arr019', normal, compile_and_run, [''])
test('arr020', normal, compile_and_run, [''])
diff --git a/testsuite/tests/arrows/should_run/all.T b/testsuite/tests/arrows/should_run/all.T
index a9867dd395..ec26c1fa92 100644
--- a/testsuite/tests/arrows/should_run/all.T
+++ b/testsuite/tests/arrows/should_run/all.T
@@ -1,8 +1,8 @@
setTestOpts(only_compiler_types(['ghc']))
test('arrowrun001', normal, compile_and_run, [''])
-test('arrowrun002', skip_if_fast, compile_and_run, [''])
+test('arrowrun002', when(fast(), skip), compile_and_run, [''])
test('arrowrun003', normal, compile_and_run, [''])
-test('arrowrun004', skip_if_fast, compile_and_run, [''])
+test('arrowrun004', when(fast(), skip), compile_and_run, [''])
test('T3822', normal, compile_and_run, [''])
diff --git a/testsuite/tests/concurrent/T2317/all.T b/testsuite/tests/concurrent/T2317/all.T
index 0ad9db3dc5..c9bcda2434 100644
--- a/testsuite/tests/concurrent/T2317/all.T
+++ b/testsuite/tests/concurrent/T2317/all.T
@@ -1,5 +1,5 @@
test('T2317',
- [skip_if_fast,
+ [when(fast(), skip),
reqlib('parallel'), reqlib('random')],
multimod_compile_and_run,
['T2317',''])
diff --git a/testsuite/tests/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T
index 70f38dca4f..a3ba7b61f1 100644
--- a/testsuite/tests/concurrent/prog001/all.T
+++ b/testsuite/tests/concurrent/prog001/all.T
@@ -13,7 +13,7 @@
# right now. --SDM 1/4/2010
test('concprog001',
- [skip_if_fast,
+ [when(fast(), skip),
only_ways(['threaded2']),
extra_clean(['Arithmetic.hi', 'Arithmetic.o',
'Converter.hi', 'Converter.o',
diff --git a/testsuite/tests/concurrent/prog002/all.T b/testsuite/tests/concurrent/prog002/all.T
index bef9de3bb7..54613a7e4a 100644
--- a/testsuite/tests/concurrent/prog002/all.T
+++ b/testsuite/tests/concurrent/prog002/all.T
@@ -13,7 +13,7 @@ test('concprog002',
[only_ways(['threaded2','threaded2_hT']),
extra_ways(ways),
exit_code(1),
- skip_if_fast,
+ when(fast(), skip),
reqlib('random'),
extra_clean(['Event.hi', 'Event.o',
'Scheduler.hi', 'Scheduler.o',
diff --git a/testsuite/tests/concurrent/prog003/all.T b/testsuite/tests/concurrent/prog003/all.T
index 874b3967dd..7522b10010 100644
--- a/testsuite/tests/concurrent/prog003/all.T
+++ b/testsuite/tests/concurrent/prog003/all.T
@@ -10,7 +10,7 @@
# occasionally, but at least the test is here for posterity.
test('concprog003',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean([
'BackList2.hi', 'BackList2.o',
'ImmList.hi', 'ImmList.o',
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index d5ceb72575..0a0778b6b9 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -127,7 +127,7 @@ if config.platform == 'i386-unknown-mingw32':
else:
conc023_ways = normal
-test('conc023', composes([skip_if_fast,
+test('conc023', composes([when(fast(), skip),
only_compiler_types(['ghc']),
reqlib('random'),
conc023_ways]), compile_and_run, [''])
@@ -170,7 +170,7 @@ test('conc036', skip, compile_and_run, [''])
# Interrupting foreign calls only makes sense if we are threaded
-test('foreignInterruptible', [skip_if_fast,
+test('foreignInterruptible', [when(fast(), skip),
when(opsys('mingw32'),expect_fail),
# I don't think we support interrupting Sleep()
# on Windows. --SDM
diff --git a/testsuite/tests/deSugar/should_run/all.T b/testsuite/tests/deSugar/should_run/all.T
index 90d76a9647..352a65239e 100644
--- a/testsuite/tests/deSugar/should_run/all.T
+++ b/testsuite/tests/deSugar/should_run/all.T
@@ -13,8 +13,8 @@ test('dsrun007', exit_code(1), compile_and_run, [''])
test('dsrun008', exit_code(1), compile_and_run, [''])
test('dsrun009', normal, compile_and_run, [''])
test('dsrun010', normal, compile_and_run, [''])
-test('dsrun011', skip_if_fast, compile_and_run, [''])
-test('dsrun012', skip_if_fast, compile_and_run, [''])
+test('dsrun011', when(fast(), skip), compile_and_run, [''])
+test('dsrun012', when(fast(), skip), compile_and_run, [''])
test('dsrun013', normal, compile_and_run, [''])
test('dsrun014', normal, compile_and_run, ['-fobject-code'])
test('dsrun015', normal, compile_and_run, [''])
diff --git a/testsuite/tests/deriving/should_run/all.T b/testsuite/tests/deriving/should_run/all.T
index 480bdbada8..eeda9aa72e 100644
--- a/testsuite/tests/deriving/should_run/all.T
+++ b/testsuite/tests/deriving/should_run/all.T
@@ -3,24 +3,24 @@
# extra run flags
# expected process return value, if not zero
-test('drvrun001', skip_if_fast, compile_and_run, [''])
-test('drvrun002', skip_if_fast, compile_and_run, [''])
-test('drvrun003', skip_if_fast, compile_and_run, [''])
-test('drvrun004', skip_if_fast, compile_and_run, [''])
-test('drvrun005', skip_if_fast, compile_and_run, [''])
+test('drvrun001', when(fast(), skip), compile_and_run, [''])
+test('drvrun002', when(fast(), skip), compile_and_run, [''])
+test('drvrun003', when(fast(), skip), compile_and_run, [''])
+test('drvrun004', when(fast(), skip), compile_and_run, [''])
+test('drvrun005', when(fast(), skip), compile_and_run, [''])
test('drvrun006', normal, compile_and_run, [''])
-test('drvrun007', skip_if_fast, compile_and_run, [''])
-test('drvrun008', skip_if_fast, compile_and_run, ['-funbox-strict-fields'])
-test('drvrun009', skip_if_fast, compile_and_run, [''])
-test('drvrun010', skip_if_fast, compile_and_run, [''])
-test('drvrun011', skip_if_fast, compile_and_run, [''])
-test('drvrun012', skip_if_fast, compile_and_run, [''])
-test('drvrun013', skip_if_fast, compile_and_run, [''])
-test('drvrun014', skip_if_fast, compile_and_run, [''])
-test('drvrun015', skip_if_fast, compile_and_run, [''])
-test('drvrun016', skip_if_fast, compile_and_run, ['-funbox-strict-fields'])
-test('drvrun017', compose(skip_if_fast, only_compiler_types(['ghc'])), compile_and_run, [''])
-test('drvrun018', skip_if_fast, compile_and_run, [''])
+test('drvrun007', when(fast(), skip), compile_and_run, [''])
+test('drvrun008', when(fast(), skip), compile_and_run, ['-funbox-strict-fields'])
+test('drvrun009', when(fast(), skip), compile_and_run, [''])
+test('drvrun010', when(fast(), skip), compile_and_run, [''])
+test('drvrun011', when(fast(), skip), compile_and_run, [''])
+test('drvrun012', when(fast(), skip), compile_and_run, [''])
+test('drvrun013', when(fast(), skip), compile_and_run, [''])
+test('drvrun014', when(fast(), skip), compile_and_run, [''])
+test('drvrun015', when(fast(), skip), compile_and_run, [''])
+test('drvrun016', when(fast(), skip), compile_and_run, ['-funbox-strict-fields'])
+test('drvrun017', compose(when(fast(), skip), only_compiler_types(['ghc'])), compile_and_run, [''])
+test('drvrun018', when(fast(), skip), compile_and_run, [''])
test('drvrun019', normal, compile_and_run, [''])
test('drvrun020', normal, compile_and_run, [''])
test('drvrun021', normal, compile_and_run, [''])
diff --git a/testsuite/tests/dph/diophantine/dph-diophantine.T b/testsuite/tests/dph/diophantine/dph-diophantine.T
index b2b772179a..1636f5aaa9 100644
--- a/testsuite/tests/dph/diophantine/dph-diophantine.T
+++ b/testsuite/tests/dph/diophantine/dph-diophantine.T
@@ -1,6 +1,6 @@
test ('dph-diophantine-copy-opt'
- , [ skip_if_fast
+ , [ when(fast(), skip)
, outputdir('opt')
, reqlib('dph-lifted-copy')
, reqlib('dph-prim-par')
diff --git a/testsuite/tests/dph/dotp/dph-dotp.T b/testsuite/tests/dph/dotp/dph-dotp.T
index bfdf7a2c7b..8800d8430b 100644
--- a/testsuite/tests/dph/dotp/dph-dotp.T
+++ b/testsuite/tests/dph/dotp/dph-dotp.T
@@ -1,7 +1,7 @@
test ('dph-dotp-copy-opt'
, [ outputdir('copy-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-copy')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2']) ]
@@ -11,7 +11,7 @@ test ('dph-dotp-copy-opt'
test ('dph-dotp-vseg-opt'
, [ outputdir('vseg-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-vseg')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2']) ]
diff --git a/testsuite/tests/dph/nbody/dph-nbody.T b/testsuite/tests/dph/nbody/dph-nbody.T
index 429ef8fa32..9c0031d16a 100644
--- a/testsuite/tests/dph/nbody/dph-nbody.T
+++ b/testsuite/tests/dph/nbody/dph-nbody.T
@@ -2,7 +2,7 @@
test ('dph-nbody-vseg-opt'
, [ high_memory_usage
, outputdir('vseg-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-vseg')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2']) ]
@@ -14,7 +14,7 @@ test ('dph-nbody-vseg-opt'
test ('dph-nbody-copy-opt'
, [ high_memory_usage
, outputdir('copy-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-copy')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2']) ]
diff --git a/testsuite/tests/dph/primespj/dph-primespj.T b/testsuite/tests/dph/primespj/dph-primespj.T
index 6976974ed0..84f41f9e2e 100644
--- a/testsuite/tests/dph/primespj/dph-primespj.T
+++ b/testsuite/tests/dph/primespj/dph-primespj.T
@@ -1,7 +1,7 @@
test ('dph-primespj-copy-opt'
, [ outputdir('opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-copy')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2']) ]
diff --git a/testsuite/tests/dph/quickhull/dph-quickhull.T b/testsuite/tests/dph/quickhull/dph-quickhull.T
index 14922821f5..bae69814a0 100644
--- a/testsuite/tests/dph/quickhull/dph-quickhull.T
+++ b/testsuite/tests/dph/quickhull/dph-quickhull.T
@@ -2,7 +2,7 @@
test ('dph-quickhull-copy-opt'
, [ high_memory_usage
, outputdir('copy-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-copy')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2']) ]
@@ -14,7 +14,7 @@ test ('dph-quickhull-copy-opt'
test ('dph-quickhull-vseg-opt'
, [ high_memory_usage
, outputdir('vseg-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-vseg')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2']) ]
diff --git a/testsuite/tests/dph/smvm/dph-smvm.T b/testsuite/tests/dph/smvm/dph-smvm.T
index 14705a6388..ae01eff83d 100644
--- a/testsuite/tests/dph/smvm/dph-smvm.T
+++ b/testsuite/tests/dph/smvm/dph-smvm.T
@@ -17,7 +17,7 @@ elif config.platform.startswith('sparc-'):
if testFile != 'nothing':
test ('dph-smvm-copy'
, [ outputdir('copy')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-copy')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2'])
@@ -29,7 +29,7 @@ if testFile != 'nothing':
test ('dph-smvm-vseg'
, [ outputdir('vseg')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-vseg')
, reqlib('dph-prim-par')
, only_ways(['normal', 'threaded1', 'threaded2'])
diff --git a/testsuite/tests/dph/words/dph-words.T b/testsuite/tests/dph/words/dph-words.T
index 04cddaee48..5301f08a9b 100644
--- a/testsuite/tests/dph/words/dph-words.T
+++ b/testsuite/tests/dph/words/dph-words.T
@@ -2,7 +2,7 @@
test ('dph-words-copy-opt'
, [ high_memory_usage
, outputdir('copy-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-copy')
, reqlib('dph-prim-par')
, only_ways(['normal']) ]
@@ -14,7 +14,7 @@ test ('dph-words-copy-opt'
test ('dph-words-vseg-opt'
, [ high_memory_usage
, outputdir('vseg-opt')
- , skip_if_fast
+ , when(fast(), skip)
, reqlib('dph-lifted-vseg')
, reqlib('dph-prim-par')
, only_ways(['normal']) ]
diff --git a/testsuite/tests/driver/dynamic_flags_001/all.T b/testsuite/tests/driver/dynamic_flags_001/all.T
index c487a0cb75..19ed656e7f 100644
--- a/testsuite/tests/driver/dynamic_flags_001/all.T
+++ b/testsuite/tests/driver/dynamic_flags_001/all.T
@@ -1,5 +1,5 @@
test('dynamic_flags_001',
- [skip_if_fast,
+ [when(fast(), skip),
clean_cmd('$MAKE -s clean')],
run_command,
['$MAKE -s --no-print-directory dynamic_flags_001'])
diff --git a/testsuite/tests/driver/dynamic_flags_002/all.T b/testsuite/tests/driver/dynamic_flags_002/all.T
index 3b0072ba6b..e5a4a564fa 100644
--- a/testsuite/tests/driver/dynamic_flags_002/all.T
+++ b/testsuite/tests/driver/dynamic_flags_002/all.T
@@ -1,6 +1,12 @@
-test('dynamic_flags_002A', skip_if_fast, multimod_compile, ['A_Main', '-v0'])
-test('dynamic_flags_002B', skip_if_fast, multimod_compile, ['B_Main', '-v0'])
-test('dynamic_flags_002C', skip_if_fast, multimod_compile, ['C_Main', '-v0'])
-test('dynamic_flags_002D', skip_if_fast, multimod_compile, ['D_Main', '-v0'])
-test('dynamic_flags_002Many', skip_if_fast, multimod_compile, ['ManyFirst ManySecond ManyThird', '-v0'])
+test('dynamic_flags_002A',
+ when(fast(), skip), multimod_compile, ['A_Main', '-v0'])
+test('dynamic_flags_002B',
+ when(fast(), skip), multimod_compile, ['B_Main', '-v0'])
+test('dynamic_flags_002C',
+ when(fast(), skip), multimod_compile, ['C_Main', '-v0'])
+test('dynamic_flags_002D',
+ when(fast(), skip), multimod_compile, ['D_Main', '-v0'])
+test('dynamic_flags_002Many',
+ when(fast(), skip), multimod_compile,
+ ['ManyFirst ManySecond ManyThird', '-v0'])
diff --git a/testsuite/tests/driver/recomp001/all.T b/testsuite/tests/driver/recomp001/all.T
index f3672fa2f8..33202d6241 100644
--- a/testsuite/tests/driver/recomp001/all.T
+++ b/testsuite/tests/driver/recomp001/all.T
@@ -1,5 +1,5 @@
test('recomp001',
- [skip_if_fast,
+ [when(fast(), skip),
clean_cmd('$MAKE -s clean')],
run_command,
['$MAKE -s --no-print-directory recomp001'])
diff --git a/testsuite/tests/driver/recomp002/all.T b/testsuite/tests/driver/recomp002/all.T
index 5f8ddf5f1b..68f1a7967e 100644
--- a/testsuite/tests/driver/recomp002/all.T
+++ b/testsuite/tests/driver/recomp002/all.T
@@ -1,5 +1,5 @@
test('recomp002',
- [skip_if_fast,
+ [when(fast(), skip),
clean_cmd('$MAKE -s clean')],
run_command,
['$MAKE -s --no-print-directory recomp002'])
diff --git a/testsuite/tests/driver/recomp005/all.T b/testsuite/tests/driver/recomp005/all.T
index d5d89b1712..5282c5b685 100644
--- a/testsuite/tests/driver/recomp005/all.T
+++ b/testsuite/tests/driver/recomp005/all.T
@@ -1,5 +1,5 @@
test('recomp005',
- [skip_if_fast,
+ [when(fast(), skip),
clean_cmd('$MAKE -s clean')],
run_command, ['$MAKE -s --no-print-directory recomp005'])
diff --git a/testsuite/tests/driver/recomp006/all.T b/testsuite/tests/driver/recomp006/all.T
index bc4f915bad..f234e58e87 100644
--- a/testsuite/tests/driver/recomp006/all.T
+++ b/testsuite/tests/driver/recomp006/all.T
@@ -1,3 +1,4 @@
test('recomp006',
- [ skip_if_fast, extra_clean(['A.o','A.hi','B.o','B.hi','err','out']) ],
+ [ when(fast(), skip),
+ extra_clean(['A.o','A.hi','B.o','B.hi','err','out']) ],
run_command, ['$MAKE -s --no-print-directory recomp006'])
diff --git a/testsuite/tests/driver/recomp007/all.T b/testsuite/tests/driver/recomp007/all.T
index 5a93a12d68..de562b6277 100644
--- a/testsuite/tests/driver/recomp007/all.T
+++ b/testsuite/tests/driver/recomp007/all.T
@@ -3,7 +3,7 @@
# "Fix a recompilation checking bug when a package dependency changes"
test('recomp007',
- [ skip_if_fast, clean_cmd('$MAKE -s clean'), normalise_slashes ],
+ [ when(fast(), skip), clean_cmd('$MAKE -s clean'), normalise_slashes ],
run_command,
['$MAKE -s --no-print-directory recomp007'])
diff --git a/testsuite/tests/driver/recomp008/all.T b/testsuite/tests/driver/recomp008/all.T
index a59b1512e0..caf81d5ba9 100644
--- a/testsuite/tests/driver/recomp008/all.T
+++ b/testsuite/tests/driver/recomp008/all.T
@@ -1,7 +1,7 @@
# Test for #4469, a recompilation bug related to instances
test('recomp008',
- [ skip_if_fast, clean_cmd('$MAKE -s clean'), normalise_slashes ],
+ [ when(fast(), skip), clean_cmd('$MAKE -s clean'), normalise_slashes ],
run_command,
['$MAKE -s --no-print-directory recomp008'])
diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index a8d62ff705..01c60112be 100644
--- a/testsuite/tests/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
@@ -67,7 +67,7 @@ if config.platform.startswith('i386-'):
else:
maybe_skip = only_ways(['ghci'])
-test('ffi009', [skip_if_fast, expect_fail_for(['extcore','optextcore']),
+test('ffi009', [when(fast(), skip), expect_fail_for(['extcore','optextcore']),
reqlib('random'),
maybe_skip] ,compile_and_run, [opts])
diff --git a/testsuite/tests/gadt/all.T b/testsuite/tests/gadt/all.T
index d55aef64e2..e5f3c5c34b 100644
--- a/testsuite/tests/gadt/all.T
+++ b/testsuite/tests/gadt/all.T
@@ -6,10 +6,10 @@ setTestOpts(only_compiler_types(['ghc']))
# In fast mode, we omit all the compile_and_run tests except a couple
test('gadt1', normal, compile, [''])
-test('gadt2', skip_if_fast, compile_and_run, [''])
+test('gadt2', when(fast(), skip), compile_and_run, [''])
test('gadt3', normal, compile, [''])
-test('gadt4', skip_if_fast, compile_and_run, [''])
-test('gadt5', skip_if_fast, compile_and_run, [''])
+test('gadt4', when(fast(), skip), compile_and_run, [''])
+test('gadt5', when(fast(), skip), compile_and_run, [''])
test('gadt6', normal, compile, [''])
test('gadt7', normal, compile_fail, [''])
test('gadt8', normal, compile, [''])
@@ -40,7 +40,7 @@ test('gadt23',
test('gadt24', normal, compile, [''])
test('red-black', normal, compile, [''])
-test('type-rep', skip_if_fast, compile_and_run, [''])
+test('type-rep', when(fast(), skip), compile_and_run, [''])
test('equal', normal, compile, [''])
test('nbe', normal, compile, [''])
test('while', normal, compile_and_run, [''])
@@ -50,13 +50,13 @@ test('lazypatok', expect_fail, compile, [''])
test('tc', normal, compile_and_run, [''])
test('arrow', normal, compile, [''])
test('tdpe', normal, compile, [''])
-test('Nilsson', skip_if_fast, compile, [''])
+test('Nilsson', when(fast(), skip), compile, [''])
if config.fast:
test('records', normal, compile, [''])
else:
test('records', normal, compile_and_run, [''])
-test('ubx-records', skip_if_fast, compile_and_run, [''])
+test('ubx-records', when(fast(), skip), compile_and_run, [''])
test('records-fail1', normal, compile_fail, [''])
test('doaitse', normal, compile, [''])
diff --git a/testsuite/tests/ghc-api/T4891/all.T b/testsuite/tests/ghc-api/T4891/all.T
index 5217e5371f..64c25912fa 100644
--- a/testsuite/tests/ghc-api/T4891/all.T
+++ b/testsuite/tests/ghc-api/T4891/all.T
@@ -1,3 +1,3 @@
-test('T4891', [skip_if_fast, extra_clean(['X.hi', 'X.o'])],
+test('T4891', [when(fast(), skip), extra_clean(['X.hi', 'X.o'])],
run_command,
['$MAKE -s --no-print-directory T4891'])
diff --git a/testsuite/tests/ghc-api/all.T b/testsuite/tests/ghc-api/all.T
index 62cd1b50af..9fa7672762 100644
--- a/testsuite/tests/ghc-api/all.T
+++ b/testsuite/tests/ghc-api/all.T
@@ -1,3 +1,3 @@
-test('T6145', [skip_if_fast],
+test('T6145', when(fast(), skip),
run_command,
['$MAKE -s --no-print-directory T6145'])
diff --git a/testsuite/tests/ghc-api/apirecomp001/all.T b/testsuite/tests/ghc-api/apirecomp001/all.T
index 0aa92874dc..f8f5abdf0c 100644
--- a/testsuite/tests/ghc-api/apirecomp001/all.T
+++ b/testsuite/tests/ghc-api/apirecomp001/all.T
@@ -1 +1,4 @@
-test('apirecomp001', skip_if_fast, run_command, ['$MAKE -s --no-print-directory apirecomp001'])
+test('apirecomp001',
+ when(fast(), skip),
+ run_command,
+ ['$MAKE -s --no-print-directory apirecomp001'])
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index e558bf6b2d..ee34ce97a8 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -37,7 +37,7 @@ test('ghci022', normal, ghci_script, ['ghci022.script'])
test('ghci023', normal, ghci_script, ['ghci023.script'])
test('ghci024',
- [skip_if_fast,
+ [when(fast(), skip),
when(platform("powerpc-apple-darwin"), expect_broken(1845))],
run_command,
['$MAKE -s --no-print-directory ghci024'])
diff --git a/testsuite/tests/programs/10queens/test.T b/testsuite/tests/programs/10queens/test.T
index 4d2b7579ba..ac0435150e 100644
--- a/testsuite/tests/programs/10queens/test.T
+++ b/testsuite/tests/programs/10queens/test.T
@@ -1,6 +1,6 @@
test('10queens',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/Queens/test.T b/testsuite/tests/programs/Queens/test.T
index 044ebf6a2c..77cf3750b5 100644
--- a/testsuite/tests/programs/Queens/test.T
+++ b/testsuite/tests/programs/Queens/test.T
@@ -1,6 +1,6 @@
test('queens',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o'])],
compile_and_run,
[''])
diff --git a/testsuite/tests/programs/andre_monad/test.T b/testsuite/tests/programs/andre_monad/test.T
index e5ad78feda..619f4fd1e7 100644
--- a/testsuite/tests/programs/andre_monad/test.T
+++ b/testsuite/tests/programs/andre_monad/test.T
@@ -1,6 +1,6 @@
# exhausts Hugs's heap (CAF leak)
test('andre_monad',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o']),
omit_compiler_types(['hugs'])],
multimod_compile_and_run,
diff --git a/testsuite/tests/programs/andy_cherry/test.T b/testsuite/tests/programs/andy_cherry/test.T
index 4d14ee306e..511eac5051 100644
--- a/testsuite/tests/programs/andy_cherry/test.T
+++ b/testsuite/tests/programs/andy_cherry/test.T
@@ -1,6 +1,6 @@
test('andy_cherry',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['DataTypes.hi', 'DataTypes.o',
'GenUtils.hi', 'GenUtils.o',
'Interp.hi', 'Interp.o',
diff --git a/testsuite/tests/programs/barton-mangler-bug/test.T b/testsuite/tests/programs/barton-mangler-bug/test.T
index 966b971ae9..bb140f56f2 100644
--- a/testsuite/tests/programs/barton-mangler-bug/test.T
+++ b/testsuite/tests/programs/barton-mangler-bug/test.T
@@ -1,7 +1,7 @@
# Exhausts Hugs's heap (CAF leak)
test('barton-mangler-bug',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Basic.hi', 'Basic.o',
'Expected.hi', 'Expected.o',
'Main.hi', 'Main.o',
diff --git a/testsuite/tests/programs/cholewo-eval/test.T b/testsuite/tests/programs/cholewo-eval/test.T
index 32efd68f7b..3b418d4ac1 100644
--- a/testsuite/tests/programs/cholewo-eval/test.T
+++ b/testsuite/tests/programs/cholewo-eval/test.T
@@ -1,5 +1,5 @@
test('cholewo-eval',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o', 'Arr.hi', 'Arr.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/cvh_unboxing/test.T b/testsuite/tests/programs/cvh_unboxing/test.T
index 4208a7f2af..6cc5ca4f6d 100644
--- a/testsuite/tests/programs/cvh_unboxing/test.T
+++ b/testsuite/tests/programs/cvh_unboxing/test.T
@@ -1,7 +1,7 @@
setTestOpts(only_compiler_types(['ghc']))
test('cvh_unboxing',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Append.hi', 'Append.o',
'Main.hi', 'Main.o',
'Types.hi', 'Types.o'])],
diff --git a/testsuite/tests/programs/fast2haskell/test.T b/testsuite/tests/programs/fast2haskell/test.T
index a730ffdfe2..621c589188 100644
--- a/testsuite/tests/programs/fast2haskell/test.T
+++ b/testsuite/tests/programs/fast2haskell/test.T
@@ -1,6 +1,6 @@
test('fast2haskell',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o',
'Fast2haskell.hi', 'Fast2haskell.o'])],
multimod_compile_and_run,
diff --git a/testsuite/tests/programs/fun_insts/test.T b/testsuite/tests/programs/fun_insts/test.T
index 5151488038..98bcf3a32f 100644
--- a/testsuite/tests/programs/fun_insts/test.T
+++ b/testsuite/tests/programs/fun_insts/test.T
@@ -1,6 +1,6 @@
test('fun_insts',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/galois_raytrace/test.T b/testsuite/tests/programs/galois_raytrace/test.T
index 169e162d6a..3bdcb75fc1 100644
--- a/testsuite/tests/programs/galois_raytrace/test.T
+++ b/testsuite/tests/programs/galois_raytrace/test.T
@@ -6,7 +6,7 @@ if config.platform.startswith('i386-') and \
setTestOpts(expect_fail_for(['hpc','optasm','profasm','threaded2','profthreaded']))
test('galois_raytrace',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['CSG.hi', 'CSG.o',
'Construct.hi', 'Construct.o',
'Data.hi', 'Data.o',
diff --git a/testsuite/tests/programs/jl_defaults/test.T b/testsuite/tests/programs/jl_defaults/test.T
index 0f6e4cbd69..b17c0b8cb5 100644
--- a/testsuite/tests/programs/jl_defaults/test.T
+++ b/testsuite/tests/programs/jl_defaults/test.T
@@ -1,6 +1,6 @@
test('jl_defaults',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/joao-circular/test.T b/testsuite/tests/programs/joao-circular/test.T
index 935ec7e6f4..3f229ab47b 100644
--- a/testsuite/tests/programs/joao-circular/test.T
+++ b/testsuite/tests/programs/joao-circular/test.T
@@ -1,5 +1,5 @@
test('joao-circular',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Data_Lazy.hi', 'Data_Lazy.o',
'Funcs_Lexer.hi', 'Funcs_Lexer.o',
'Funcs_Parser_Lazy.hi', 'Funcs_Parser_Lazy.o',
diff --git a/testsuite/tests/programs/jq_readsPrec/test.T b/testsuite/tests/programs/jq_readsPrec/test.T
index 393f82c4b3..dcad28cd7b 100644
--- a/testsuite/tests/programs/jq_readsPrec/test.T
+++ b/testsuite/tests/programs/jq_readsPrec/test.T
@@ -1,6 +1,6 @@
test('jq_readsPrec',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/jtod_circint/test.T b/testsuite/tests/programs/jtod_circint/test.T
index 47338d7b89..b6ad840a26 100644
--- a/testsuite/tests/programs/jtod_circint/test.T
+++ b/testsuite/tests/programs/jtod_circint/test.T
@@ -1,6 +1,6 @@
test('jtod_circint',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Bit.hi', 'Bit.o',
'LogFun.hi', 'LogFun.o',
'Main.hi', 'Main.o',
diff --git a/testsuite/tests/programs/jules_xref/test.T b/testsuite/tests/programs/jules_xref/test.T
index 07da9cbd0d..a8941e0331 100644
--- a/testsuite/tests/programs/jules_xref/test.T
+++ b/testsuite/tests/programs/jules_xref/test.T
@@ -1,6 +1,6 @@
# exhausts Hugs's heap
test('jules_xref',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o']),
omit_compiler_types(['hugs'])],
multimod_compile_and_run,
diff --git a/testsuite/tests/programs/jules_xref2/test.T b/testsuite/tests/programs/jules_xref2/test.T
index 384155c8c7..2e627ab89c 100644
--- a/testsuite/tests/programs/jules_xref2/test.T
+++ b/testsuite/tests/programs/jules_xref2/test.T
@@ -1,6 +1,6 @@
test('jules_xref2',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/launchbury/test.T b/testsuite/tests/programs/launchbury/test.T
index 937bb94a6e..0af619f4c1 100644
--- a/testsuite/tests/programs/launchbury/test.T
+++ b/testsuite/tests/programs/launchbury/test.T
@@ -1,6 +1,6 @@
test('launchbury',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/lennart_range/test.T b/testsuite/tests/programs/lennart_range/test.T
index f308f0039d..0cc5a351f5 100644
--- a/testsuite/tests/programs/lennart_range/test.T
+++ b/testsuite/tests/programs/lennart_range/test.T
@@ -1,6 +1,6 @@
test('lennart_range',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/lex/test.T b/testsuite/tests/programs/lex/test.T
index da6e227a68..79459772a0 100644
--- a/testsuite/tests/programs/lex/test.T
+++ b/testsuite/tests/programs/lex/test.T
@@ -1,6 +1,6 @@
test('lex',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/life_space_leak/test.T b/testsuite/tests/programs/life_space_leak/test.T
index a0cdc2c761..11f73e0eb0 100644
--- a/testsuite/tests/programs/life_space_leak/test.T
+++ b/testsuite/tests/programs/life_space_leak/test.T
@@ -1,6 +1,6 @@
# exhausts Hugs's heap (CAF leak)
test('life_space_leak',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o']),
when(compiler_type('hugs'), expect_fail)],
multimod_compile_and_run,
diff --git a/testsuite/tests/programs/maessen-hashtab/test.T b/testsuite/tests/programs/maessen-hashtab/test.T
index 807cb85e81..e21d2bb1c6 100644
--- a/testsuite/tests/programs/maessen-hashtab/test.T
+++ b/testsuite/tests/programs/maessen-hashtab/test.T
@@ -3,7 +3,7 @@ test('maessen_hashtab',
[reqlib('QuickCheck'),
extra_clean(['HashTest.hi', 'HashTest.o',
'Data/HashTab.hi', 'Data/HashTab.o']),
- skip_if_fast,
+ when(fast(), skip),
# this test runs out of time when not optimised:
omit_ways(['normal','ghci','threaded1']),
extra_run_opts('99999')],
diff --git a/testsuite/tests/programs/north_array/test.T b/testsuite/tests/programs/north_array/test.T
index e2b89b4501..d822897d59 100644
--- a/testsuite/tests/programs/north_array/test.T
+++ b/testsuite/tests/programs/north_array/test.T
@@ -1,6 +1,6 @@
test('north_array',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/okeefe_neural/test.T b/testsuite/tests/programs/okeefe_neural/test.T
index 326dd6b0f0..e905ec0b99 100644
--- a/testsuite/tests/programs/okeefe_neural/test.T
+++ b/testsuite/tests/programs/okeefe_neural/test.T
@@ -5,7 +5,7 @@ def set_opts( name, opts ):
opts.expect = 'fail'
test('okeefe_neural',
- [skip_if_fast,
+ [when(fast(), skip),
set_opts,
extra_clean(['Main.hi'])],
multimod_compile_and_run,
diff --git a/testsuite/tests/programs/record_upd/test.T b/testsuite/tests/programs/record_upd/test.T
index e98b70c43e..46149575b2 100644
--- a/testsuite/tests/programs/record_upd/test.T
+++ b/testsuite/tests/programs/record_upd/test.T
@@ -1,6 +1,6 @@
test('record_upd',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/rittri/test.T b/testsuite/tests/programs/rittri/test.T
index 2e14f6fdcc..57e7805ea3 100644
--- a/testsuite/tests/programs/rittri/test.T
+++ b/testsuite/tests/programs/rittri/test.T
@@ -1,6 +1,6 @@
test('rittri',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/sanders_array/test.T b/testsuite/tests/programs/sanders_array/test.T
index 03c4d4eece..6e0a8c6e79 100644
--- a/testsuite/tests/programs/sanders_array/test.T
+++ b/testsuite/tests/programs/sanders_array/test.T
@@ -1,6 +1,6 @@
test('sanders_array',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/seward-space-leak/test.T b/testsuite/tests/programs/seward-space-leak/test.T
index bdb7759275..491da8e6c8 100644
--- a/testsuite/tests/programs/seward-space-leak/test.T
+++ b/testsuite/tests/programs/seward-space-leak/test.T
@@ -1,7 +1,7 @@
setTestOpts(omit_compiler_types(['hugs'])) # takes much too long
test('seward-space-leak',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/strict_anns/test.T b/testsuite/tests/programs/strict_anns/test.T
index 77ed9dab53..e64ee2fb7b 100644
--- a/testsuite/tests/programs/strict_anns/test.T
+++ b/testsuite/tests/programs/strict_anns/test.T
@@ -1,6 +1,6 @@
test('strict_anns',
- [skip_if_fast, extra_clean(['Main.hi', 'Main.o'])],
+ [when(fast(), skip), extra_clean(['Main.hi', 'Main.o'])],
multimod_compile_and_run,
['Main', ''])
diff --git a/testsuite/tests/programs/thurston-modular-arith/test.T b/testsuite/tests/programs/thurston-modular-arith/test.T
index 812fb07ba0..0af870e0d2 100644
--- a/testsuite/tests/programs/thurston-modular-arith/test.T
+++ b/testsuite/tests/programs/thurston-modular-arith/test.T
@@ -1,6 +1,6 @@
# uses GHC-specific scoped type variables
test('thurston-modular-arith',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o', 'TypeVal.hi', 'TypeVal.o']),
only_compiler_types(['ghc'])],
multimod_compile_and_run,
diff --git a/testsuite/tests/quasiquotation/qq005/test.T b/testsuite/tests/quasiquotation/qq005/test.T
index 52671ef838..efa7b9d955 100644
--- a/testsuite/tests/quasiquotation/qq005/test.T
+++ b/testsuite/tests/quasiquotation/qq005/test.T
@@ -1,5 +1,5 @@
test('qq005',
- [skip_if_fast,
+ [when(fast(), skip),
reqlib('parsec'),
only_compiler_types(['ghc']),
# We'd need to jump through some hoops to run this test the
diff --git a/testsuite/tests/quasiquotation/qq006/test.T b/testsuite/tests/quasiquotation/qq006/test.T
index 21d9a3db1c..be471de9ca 100644
--- a/testsuite/tests/quasiquotation/qq006/test.T
+++ b/testsuite/tests/quasiquotation/qq006/test.T
@@ -1,5 +1,5 @@
test('qq006',
- [skip_if_fast,
+ [when(fast(), skip),
reqlib('parsec'),
extra_clean(['Expr.hi', 'Expr.o']),
only_compiler_types(['ghc'])],
diff --git a/testsuite/tests/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T
index 6b7ef6dcd7..61374e5719 100644
--- a/testsuite/tests/quasiquotation/qq007/test.T
+++ b/testsuite/tests/quasiquotation/qq007/test.T
@@ -1,5 +1,5 @@
test('qq007',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
# We'd need to jump through some hoops to run this test the
# profiling ways, due to the TH use, so for now we just
diff --git a/testsuite/tests/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T
index 02b88dbd0a..5d41999637 100644
--- a/testsuite/tests/quasiquotation/qq008/test.T
+++ b/testsuite/tests/quasiquotation/qq008/test.T
@@ -1,5 +1,5 @@
test('qq008',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
# We'd need to jump through some hoops to run this test the
# profiling ways, due to the TH use, so for now we just
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 8da87aae6b..3ccd142975 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -69,7 +69,7 @@ test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
test('atomicinc', [ c_src, only_ways(['normal']) ], compile_and_run, [''])
test('T3424', # it's slow:
- [ skip_if_fast, only_ways(['normal','threaded1','ghci']) ],
+ [ when(fast(), skip), only_ways(['normal','threaded1','ghci']) ],
compile_and_run, [''])
# Test for out-of-range heap size
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 765a128268..570f295c10 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -29,7 +29,7 @@ test('simpl-T1370', normal, compile, [''])
test('T2520', normal, compile, [''])
-test('spec001', skip_if_fast, compile, [''])
+test('spec001', when(fast(), skip), compile, [''])
test('spec002', normal, compile, [''])
test('spec003', normal, compile, [''])
@@ -44,7 +44,7 @@ test('T4203', normal, compile, [''])
# With -prof -fvia-C, this test makes gcc go out to lunch, and the
# testsuite driver times out.
-test('T3016', skip_if_fast, compile, [''])
+test('T3016', when(fast(), skip), compile, [''])
test('T1647', normal, compile, ['-fdicts-strict -dcore-lint'])
diff --git a/testsuite/tests/typecheck/prog001/test.T b/testsuite/tests/typecheck/prog001/test.T
index 09bb3f0f30..1f0d67cbae 100644
--- a/testsuite/tests/typecheck/prog001/test.T
+++ b/testsuite/tests/typecheck/prog001/test.T
@@ -1,6 +1,6 @@
test('typecheck.prog001',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['A.hi', 'A.o', 'B.hi', 'B.o', 'C.hi', 'C.o'])],
multimod_compile,
['C', '-v0'])
diff --git a/testsuite/tests/typecheck/prog002/test.T b/testsuite/tests/typecheck/prog002/test.T
index 24625bad04..adac6d5022 100644
--- a/testsuite/tests/typecheck/prog002/test.T
+++ b/testsuite/tests/typecheck/prog002/test.T
@@ -1,7 +1,7 @@
setTestOpts(only_compiler_types(['ghc']))
test('typecheck.prog002',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['A.hi', 'A.o', 'B.hi', 'B.o'])],
multimod_compile,
['B', '-v0'])
diff --git a/testsuite/tests/typecheck/testeq1/test.T b/testsuite/tests/typecheck/testeq1/test.T
index dbb63fb9f8..c1b97e90fe 100644
--- a/testsuite/tests/typecheck/testeq1/test.T
+++ b/testsuite/tests/typecheck/testeq1/test.T
@@ -1,6 +1,6 @@
test('typecheck.testeq1',
- [skip_if_fast,
+ [when(fast(), skip),
extra_clean(['Main.hi', 'Main.o',
'TypeCast.hi', 'TypeCast.o',
'FakePrelude.hi', 'FakePrelude.o',