More helper conversions
authorIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 15:39:12 +0000 (15:39 +0000)
committerIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 15:39:12 +0000 (15:39 +0000)
70 files changed:
testsuite/driver/testlib.py
testsuite/tests/annotations/should_run/all.T
testsuite/tests/array/should_run/all.T
testsuite/tests/arrows/should_run/all.T
testsuite/tests/concurrent/T2317/all.T
testsuite/tests/concurrent/prog001/all.T
testsuite/tests/concurrent/prog002/all.T
testsuite/tests/concurrent/prog003/all.T
testsuite/tests/concurrent/should_run/all.T
testsuite/tests/deSugar/should_run/all.T
testsuite/tests/deriving/should_run/all.T
testsuite/tests/dph/diophantine/dph-diophantine.T
testsuite/tests/dph/dotp/dph-dotp.T
testsuite/tests/dph/nbody/dph-nbody.T
testsuite/tests/dph/primespj/dph-primespj.T
testsuite/tests/dph/quickhull/dph-quickhull.T
testsuite/tests/dph/smvm/dph-smvm.T
testsuite/tests/dph/words/dph-words.T
testsuite/tests/driver/dynamic_flags_001/all.T
testsuite/tests/driver/dynamic_flags_002/all.T
testsuite/tests/driver/recomp001/all.T
testsuite/tests/driver/recomp002/all.T
testsuite/tests/driver/recomp005/all.T
testsuite/tests/driver/recomp006/all.T
testsuite/tests/driver/recomp007/all.T
testsuite/tests/driver/recomp008/all.T
testsuite/tests/ffi/should_run/all.T
testsuite/tests/gadt/all.T
testsuite/tests/ghc-api/T4891/all.T
testsuite/tests/ghc-api/all.T
testsuite/tests/ghc-api/apirecomp001/all.T
testsuite/tests/ghci/scripts/all.T
testsuite/tests/programs/10queens/test.T
testsuite/tests/programs/Queens/test.T
testsuite/tests/programs/andre_monad/test.T
testsuite/tests/programs/andy_cherry/test.T
testsuite/tests/programs/barton-mangler-bug/test.T
testsuite/tests/programs/cholewo-eval/test.T
testsuite/tests/programs/cvh_unboxing/test.T
testsuite/tests/programs/fast2haskell/test.T
testsuite/tests/programs/fun_insts/test.T
testsuite/tests/programs/galois_raytrace/test.T
testsuite/tests/programs/jl_defaults/test.T
testsuite/tests/programs/joao-circular/test.T
testsuite/tests/programs/jq_readsPrec/test.T
testsuite/tests/programs/jtod_circint/test.T
testsuite/tests/programs/jules_xref/test.T
testsuite/tests/programs/jules_xref2/test.T
testsuite/tests/programs/launchbury/test.T
testsuite/tests/programs/lennart_range/test.T
testsuite/tests/programs/lex/test.T
testsuite/tests/programs/life_space_leak/test.T
testsuite/tests/programs/maessen-hashtab/test.T
testsuite/tests/programs/north_array/test.T
testsuite/tests/programs/okeefe_neural/test.T
testsuite/tests/programs/record_upd/test.T
testsuite/tests/programs/rittri/test.T
testsuite/tests/programs/sanders_array/test.T
testsuite/tests/programs/seward-space-leak/test.T
testsuite/tests/programs/strict_anns/test.T
testsuite/tests/programs/thurston-modular-arith/test.T
testsuite/tests/quasiquotation/qq005/test.T
testsuite/tests/quasiquotation/qq006/test.T
testsuite/tests/quasiquotation/qq007/test.T
testsuite/tests/quasiquotation/qq008/test.T
testsuite/tests/rts/all.T
testsuite/tests/simplCore/should_compile/all.T
testsuite/tests/typecheck/prog001/test.T
testsuite/tests/typecheck/prog002/test.T
testsuite/tests/typecheck/testeq1/test.T

index 7fcdaef..89d6c2e 100644 (file)
@@ -299,12 +299,6 @@ def skip_if_no_ghci(name, opts):
 
 # ----
 
-def skip_if_fast(name, opts):
-    if config.fast:
-        opts.skip = 1
-
-# -----
-
 def when(b, f):
     # When list_brokens is on, we want to see all expect_broken calls,
     # so we always do f
@@ -316,6 +310,9 @@ def when(b, f):
 def unless(b, f):
     return when(not b, f)
 
+def fast():
+    return config.fast
+
 def platform( plat ):
     return config.platform == plat
 
index 6616de5..444ac30 100644 (file)
@@ -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
index eee3b12..a0cfc6b 100644 (file)
@@ -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, [''])
index a9867dd..ec26c1f 100644 (file)
@@ -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, [''])
 
index 0ad9db3..c9bcda2 100644 (file)
@@ -1,5 +1,5 @@
 test('T2317',
-     [skip_if_fast,
+     [when(fast(), skip),
       reqlib('parallel'), reqlib('random')],
      multimod_compile_and_run,
      ['T2317',''])
index 70f38dc..a3ba7b6 100644 (file)
@@ -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',
index bef9de3..54613a7 100644 (file)
@@ -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',
index 874b396..7522b10 100644 (file)
@@ -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',
index d5ceb72..0a0778b 100644 (file)
@@ -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
index 90d76a9..352a652 100644 (file)
@@ -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, [''])
index 480bdba..eeda9aa 100644 (file)
@@ -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, [''])
index b2b7721..1636f5a 100644 (file)
@@ -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')
index bfdf7a2..8800d84 100644 (file)
@@ -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']) ] 
index 429ef8f..9c0031d 100644 (file)
@@ -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']) ] 
index 6976974..84f41f9 100644 (file)
@@ -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']) ] 
index 1492282..bae6981 100644 (file)
@@ -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']) ] 
index 14705a6..ae01eff 100644 (file)
@@ -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'])
index 04cddae..5301f08 100644 (file)
@@ -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']) ] 
index c487a0c..19ed656 100644 (file)
@@ -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'])
index 3b0072b..e5a4a56 100644 (file)
@@ -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'])
 
index f3672fa..33202d6 100644 (file)
@@ -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'])
index 5f8ddf5..68f1a79 100644 (file)
@@ -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'])
index d5d89b1..5282c5b 100644 (file)
@@ -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'])
 
index bc4f915..f234e58 100644 (file)
@@ -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'])
index 5a93a12..de562b6 100644 (file)
@@ -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'])
 
index a59b151..caf81d5 100644 (file)
@@ -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'])
 
index a8d62ff..01c6011 100644 (file)
@@ -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])
 
index d55aef6..e5f3c5c 100644 (file)
@@ -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, [''])
index 5217e53..64c2591 100644 (file)
@@ -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'])
index 62cd1b5..9fa7672 100644 (file)
@@ -1,3 +1,3 @@
-test('T6145', [skip_if_fast],
+test('T6145', when(fast(), skip),
               run_command,
               ['$MAKE -s --no-print-directory T6145'])
index 0aa9287..f8f5abd 100644 (file)
@@ -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'])
index e558bf6..ee34ce9 100755 (executable)
@@ -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'])
index 4d2b757..ac04351 100644 (file)
@@ -1,6 +1,6 @@
 
 test('10queens',
-     [skip_if_fast,
+     [when(fast(), skip),
       extra_clean(['Main.hi', 'Main.o'])],
      multimod_compile_and_run,
      ['Main', ''])
index 044ebf6..77cf375 100644 (file)
@@ -1,6 +1,6 @@
 
 test('queens',
-     [skip_if_fast,
+     [when(fast(), skip),
       extra_clean(['Main.hi', 'Main.o'])],
      compile_and_run,
      [''])
index e5ad78f..619f4fd 100644 (file)
@@ -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,
index 4d14ee3..511eac5 100644 (file)
@@ -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',
index 966b971..bb140f5 100644 (file)
@@ -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',
index 32efd68..3b418d4 100644 (file)
@@ -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', ''])
index 4208a7f..6cc5ca4 100644 (file)
@@ -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'])],
index a730ffd..621c589 100644 (file)
@@ -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,
index 5151488..98bcf3a 100644 (file)
@@ -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', ''])
 
index 169e162..3bdcb75 100644 (file)
@@ -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',
index 0f6e4cb..b17c0b8 100644 (file)
@@ -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', ''])
 
index 935ec7e..3f229ab 100644 (file)
@@ -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',
index 393f82c..dcad28c 100644 (file)
@@ -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', ''])
 
index 47338d7..b6ad840 100644 (file)
@@ -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',
index 07da9cb..a8941e0 100644 (file)
@@ -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,
index 384155c..2e627ab 100644 (file)
@@ -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', ''])
 
index 937bb94..0af619f 100644 (file)
@@ -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', ''])
 
index f308f00..0cc5a35 100644 (file)
@@ -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', ''])
 
index da6e227..7945977 100644 (file)
@@ -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', ''])
 
index a0cdc2c..11f73e0 100644 (file)
@@ -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,
index 807cb85..e21d2bb 100644 (file)
@@ -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')],
index e2b89b4..d822897 100644 (file)
@@ -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', ''])
 
index 326dd6b..e905ec0 100644 (file)
@@ -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,
index e98b70c..4614957 100644 (file)
@@ -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', ''])
 
index 2e14f6f..57e7805 100644 (file)
@@ -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', ''])
 
index 03c4d4e..6e0a8c6 100644 (file)
@@ -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', ''])
 
index bdb7759..491da8e 100644 (file)
@@ -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', ''])
 
index 77ed9da..e64ee2f 100644 (file)
@@ -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', ''])
 
index 812fb07..0af870e 100644 (file)
@@ -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,
index 52671ef..efa7b9d 100644 (file)
@@ -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
index 21d9a3d..be471de 100644 (file)
@@ -1,5 +1,5 @@
 test('qq006',
-     [skip_if_fast,
+     [when(fast(), skip),
       reqlib('parsec'),
       extra_clean(['Expr.hi', 'Expr.o']),
       only_compiler_types(['ghc'])],
index 6b7ef6d..61374e5 100644 (file)
@@ -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
index 02b88db..5d41999 100644 (file)
@@ -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
index 8da87aa..3ccd142 100644 (file)
@@ -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
index 765a128..570f295 100644 (file)
@@ -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'])
 
index 09bb3f0..1f0d67c 100644 (file)
@@ -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'])
index 24625ba..adac6d5 100644 (file)
@@ -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'])
index dbb63fb..c1b97e9 100644 (file)
@@ -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',