Follow changes in testsuite
authorIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 15:50:25 +0000 (15:50 +0000)
committerIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 15:50:25 +0000 (15:50 +0000)
tests/fork/test.T
tests/function/test.T
tests/function2/test.T
tests/ghc_ghci/test.T
tests/raytrace/test.T
tests/raytrace/tixs/test.T
tests/simple/test.T
tests/simple/tixs/test.T

index 4227b2c..b03ed14 100644 (file)
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
                    compose(omit_ways(['ghci','threaded2']),
-                           skip_if_fast)))
+                           when(fast(), skip))))
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index d1e11cb..cded6c1 100644 (file)
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
                    compose(omit_ways(['ghci']),
-                           skip_if_fast)))
+                           when(fast(), skip))))
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index 5337ca2..c88908e 100644 (file)
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
                    compose(omit_ways(['ghci']),
-                           skip_if_fast)))
+                           when(fast(), skip))))
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index bad4fce..c38dd83 100644 (file)
@@ -3,7 +3,7 @@ test('hpc_ghc_ghci',
      [extra_clean(['A.hi', 'A.o', '.hpc/A.mix', '.hpc/']),
       only_ways(['normal']),
       only_compiler_types(['ghc']),
-      if_compiler_profiled(skip),
+      when(compiler_profiled(), skip),
       req_interp],
      run_command,
      ['$MAKE -s --no-print-directory hpc_ghc_ghci'])
index ae7cbd1..1c04e0b 100644 (file)
@@ -1,11 +1,11 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
                    compose(omit_ways(['ghci']),
-                           skip_if_fast)))
+                           when(fast(), skip))))
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
 test('hpc_raytrace', \
-       [ skip_if_fast, cmd_prefix(hpc_prefix), reqlib('parsec') ], \
+       [ when(fast(), skip), cmd_prefix(hpc_prefix), reqlib('parsec') ], \
        multimod_compile_and_run, \
        ['Main','-fhpc -package parsec'])
 
index fa34963..8fae9cc 100644 (file)
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
                    compose(omit_ways(['ghci']),
-                           skip_if_fast)))
+                           when(fast(), skip))))
 
 hpcsample = 'hpc_sample'
 
index b9f5bef..36917c7 100644 (file)
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
                    compose(omit_ways(['ghci']),
-                           skip_if_fast)))
+                           when(fast(), skip))))
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index 7e6e6d0..912d2e4 100644 (file)
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
                    compose(omit_ways(['ghci']),
-                           skip_if_fast)))
+                           when(fast(), skip))))
 
 hpcsample = 'hpc_sample'