More helper conversions

29 files changed, 29 insertions, 29 deletions

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,