[commit: hpc] master: Remove uses of compose(s) in tests (0d596ba)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0d596baa1127eba965aeb2243ae19944d9373d1a

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

commit 0d596baa1127eba965aeb2243ae19944d9373d1a
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 14 14:48:01 2013 +0000

    Remove uses of compose(s) in tests

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

 tests/fork/test.T          |    6 +++---
 tests/function/test.T      |    6 +++---
 tests/function2/test.T     |    6 +++---
 tests/raytrace/test.T      |    6 +++---
 tests/raytrace/tixs/test.T |    6 +++---
 tests/simple/test.T        |    6 +++---
 tests/simple/tixs/test.T   |    6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/fork/test.T b/tests/fork/test.T
index b03ed14..bd34cc2 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']),
-			    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 + "'";
 
diff --git a/tests/function/test.T b/tests/function/test.T
index cded6c1..2ff4d4b 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']),
-			    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 + "'";
 
diff --git a/tests/function2/test.T b/tests/function2/test.T
index c88908e..f646606 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']),
-			    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 + "'";
 
diff --git a/tests/raytrace/test.T b/tests/raytrace/test.T
index 1c04e0b..a8c6601 100644
--- a/tests/raytrace/test.T
+++ b/tests/raytrace/test.T
@@ -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 + "'";
 
diff --git a/tests/raytrace/tixs/test.T b/tests/raytrace/tixs/test.T
index 8fae9cc..d5614ab 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']),
-			    when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpcsample = 'hpc_sample'
 
diff --git a/tests/simple/test.T b/tests/simple/test.T
index 36917c7..ac4466b 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']),
-			    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 + "'";
 
diff --git a/tests/simple/tixs/test.T b/tests/simple/tixs/test.T
index 912d2e4..47da645 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']),
-			    when(fast(), skip))))
+setTestOpts([only_compiler_types(['ghc']),
+             omit_ways(['ghci']),
+             when(fast(), skip)])
 
 hpcsample = 'hpc_sample'