Remove uses of compose(s) in tests
authorIan Lynagh <ian@well-typed.com>
Thu, 14 Feb 2013 14:48:01 +0000 (14:48 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 14 Feb 2013 14:48:01 +0000 (14:48 +0000)
tests/fork/test.T
tests/function/test.T
tests/function2/test.T
tests/raytrace/test.T
tests/raytrace/tixs/test.T
tests/simple/test.T
tests/simple/tixs/test.T

index b03ed14..bd34cc2 100644 (file)
@@ -1,6 +1,6 @@
-setTestOpts(compose(only_compiler_types(['ghc']),
-                   compose(omit_ways(['ghci','threaded2']),
-                           when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci','threaded2']),
+             when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index cded6c1..2ff4d4b 100644 (file)
@@ -1,6 +1,6 @@
-setTestOpts(compose(only_compiler_types(['ghc']),
-                   compose(omit_ways(['ghci']),
-                           when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index c88908e..f646606 100644 (file)
@@ -1,6 +1,6 @@
-setTestOpts(compose(only_compiler_types(['ghc']),
-                   compose(omit_ways(['ghci']),
-                           when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index 1c04e0b..a8c6601 100644 (file)
@@ -1,6 +1,6 @@
-setTestOpts(compose(only_compiler_types(['ghc']),
-                   compose(omit_ways(['ghci']),
-                           when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index 8fae9cc..d5614ab 100644 (file)
@@ -1,6 +1,6 @@
-setTestOpts(compose(only_compiler_types(['ghc']),
-                   compose(omit_ways(['ghci']),
-                           when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpcsample = 'hpc_sample'
 
index 36917c7..ac4466b 100644 (file)
@@ -1,6 +1,6 @@
-setTestOpts(compose(only_compiler_types(['ghc']),
-                   compose(omit_ways(['ghci']),
-                           when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext=" + config.exeext + " --hpc='" + config.hpc + "'";
 
index 912d2e4..47da645 100644 (file)
@@ -1,6 +1,6 @@
-setTestOpts(compose(only_compiler_types(['ghc']),
-                   compose(omit_ways(['ghci']),
-                           when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpcsample = 'hpc_sample'