[commit: hpc] master: Follow changes in testsuite (f38d16f)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/hpc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f38d16f27e632510bc1c7269b84952f171c1fd7c

>---------------------------------------------------------------

commit f38d16f27e632510bc1c7269b84952f171c1fd7c
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Feb 11 15:50:25 2013 +0000

    Follow changes in testsuite

>---------------------------------------------------------------

 tests/fork/test.T          |    2 +-
 tests/function/test.T      |    2 +-
 tests/function2/test.T     |    2 +-
 tests/ghc_ghci/test.T      |    2 +-
 tests/raytrace/test.T      |    4 ++--
 tests/raytrace/tixs/test.T |    2 +-
 tests/simple/test.T        |    2 +-
 tests/simple/tixs/test.T   |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/fork/test.T b/tests/fork/test.T
index 4227b2c..b03ed14 100644
--- a/tests/fork/test.T
+++ b/tests/fork/test.T
@@ -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 + "'";
 
diff --git a/tests/function/test.T b/tests/function/test.T
index d1e11cb..cded6c1 100644
--- a/tests/function/test.T
+++ b/tests/function/test.T
@@ -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 + "'";
 
diff --git a/tests/function2/test.T b/tests/function2/test.T
index 5337ca2..c88908e 100644
--- a/tests/function2/test.T
+++ b/tests/function2/test.T
@@ -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 + "'";
 
diff --git a/tests/ghc_ghci/test.T b/tests/ghc_ghci/test.T
index bad4fce..c38dd83 100644
--- a/tests/ghc_ghci/test.T
+++ b/tests/ghc_ghci/test.T
@@ -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'])
diff --git a/tests/raytrace/test.T b/tests/raytrace/test.T
index ae7cbd1..1c04e0b 100644
--- a/tests/raytrace/test.T
+++ b/tests/raytrace/test.T
@@ -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'])
 
diff --git a/tests/raytrace/tixs/test.T b/tests/raytrace/tixs/test.T
index fa34963..8fae9cc 100644
--- a/tests/raytrace/tixs/test.T
+++ b/tests/raytrace/tixs/test.T
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
 		    compose(omit_ways(['ghci']),
-			    skip_if_fast)))
+			    when(fast(), skip))))
 
 hpcsample = 'hpc_sample'
 
diff --git a/tests/simple/test.T b/tests/simple/test.T
index b9f5bef..36917c7 100644
--- a/tests/simple/test.T
+++ b/tests/simple/test.T
@@ -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 + "'";
 
diff --git a/tests/simple/tixs/test.T b/tests/simple/tixs/test.T
index 7e6e6d0..912d2e4 100644
--- a/tests/simple/tixs/test.T
+++ b/tests/simple/tixs/test.T
@@ -1,6 +1,6 @@
 setTestOpts(compose(only_compiler_types(['ghc']),
 		    compose(omit_ways(['ghci']),
-			    skip_if_fast)))
+			    when(fast(), skip))))
 
 hpcsample = 'hpc_sample'