[commit: packages/hpc] master: Don't use only_compiler_types, assume ghc (6bfeb4c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/hpc

On branch  : master
Link       : http://git.haskell.org/packages/hpc.git/commitdiff/6bfeb4c73ef44d2074f6edb314b9735bb57b8ef1

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

commit 6bfeb4c73ef44d2074f6edb314b9735bb57b8ef1
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Feb 16 11:47:23 2016 +0100

    Don't use only_compiler_types, assume ghc


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

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

diff --git a/tests/fork/test.T b/tests/fork/test.T
index 40638fa..cd8b963 100644
--- a/tests/fork/test.T
+++ b/tests/fork/test.T
@@ -1,6 +1,4 @@
-setTestOpts([only_compiler_types(['ghc']),
-             omit_ways(['ghci','threaded2']),
-             when(fast(), skip)])
+setTestOpts([omit_ways(['ghci','threaded2']), when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
diff --git a/tests/function/test.T b/tests/function/test.T
index 88bc6b1..15bf7b2 100644
--- a/tests/function/test.T
+++ b/tests/function/test.T
@@ -1,6 +1,4 @@
-setTestOpts([only_compiler_types(['ghc']),
-             omit_ways(['ghci']),
-             when(fast(), skip)])
+setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
diff --git a/tests/function2/test.T b/tests/function2/test.T
index b9362fd..52d78fb 100644
--- a/tests/function2/test.T
+++ b/tests/function2/test.T
@@ -1,6 +1,4 @@
-setTestOpts([only_compiler_types(['ghc']),
-             omit_ways(['ghci']),
-             when(fast(), skip)])
+setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
diff --git a/tests/ghc_ghci/test.T b/tests/ghc_ghci/test.T
index c38dd83..25dfa9b 100644
--- a/tests/ghc_ghci/test.T
+++ b/tests/ghc_ghci/test.T
@@ -1,10 +1,5 @@
 
 test('hpc_ghc_ghci',
      [extra_clean(['A.hi', 'A.o', '.hpc/A.mix', '.hpc/']),
-      only_ways(['normal']),
-      only_compiler_types(['ghc']),
-      when(compiler_profiled(), skip),
-      req_interp],
-     run_command,
-     ['$MAKE -s --no-print-directory hpc_ghc_ghci'])
-
+      only_ways(['normal']), when(compiler_profiled(), skip), req_interp],
+     run_command, ['$MAKE -s --no-print-directory hpc_ghc_ghci'])
\ No newline at end of file
diff --git a/tests/raytrace/test.T b/tests/raytrace/test.T
index d56a000..882fce2 100644
--- a/tests/raytrace/test.T
+++ b/tests/raytrace/test.T
@@ -1,6 +1,4 @@
-setTestOpts([only_compiler_types(['ghc']),
-             omit_ways(['ghci']),
-             when(fast(), skip)])
+setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
diff --git a/tests/raytrace/tixs/test.T b/tests/raytrace/tixs/test.T
index 0a9428e..4d4a6f0 100644
--- a/tests/raytrace/tixs/test.T
+++ b/tests/raytrace/tixs/test.T
@@ -1,6 +1,4 @@
-setTestOpts([only_compiler_types(['ghc']),
-             omit_ways(['ghci']),
-             when(fast(), skip)])
+setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
 test('hpc_report_multi_001', normal, run_command,
      ["{hpc} report hpc_sample --include=Geometry --per-module"])
diff --git a/tests/simple/test.T b/tests/simple/test.T
index f416a63..521d7bf 100644
--- a/tests/simple/test.T
+++ b/tests/simple/test.T
@@ -1,6 +1,4 @@
-setTestOpts([only_compiler_types(['ghc']),
-             omit_ways(['ghci']),
-             when(fast(), skip)])
+setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
 hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
diff --git a/tests/simple/tixs/test.T b/tests/simple/tixs/test.T
index 71c9ad5..a32b4a9 100644
--- a/tests/simple/tixs/test.T
+++ b/tests/simple/tixs/test.T
@@ -1,6 +1,4 @@
-setTestOpts([only_compiler_types(['ghc']),
-             omit_ways(['ghci']),
-             when(fast(), skip)])
+setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
 test('hpc_help', normal, run_command, ["{hpc} help"])
 test('hpc_help_help', normal, run_command, ["{hpc} help help"])