[commit: packages/hpc] master: Testsuite: run tests in <testname>-run instead of /tmp (b52ab0c)

[git at git.haskell.org]

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

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

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

commit b52ab0cc013beb1440607a7e4521a45fd6e96ce8
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Jun 13 17:47:16 2016 +0200

    Testsuite: run tests in <testname>-run instead of /tmp


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

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

diff --git a/tests/fork/test.T b/tests/fork/test.T
index cd8b963..936557d 100644
--- a/tests/fork/test.T
+++ b/tests/fork/test.T
@@ -1,6 +1,6 @@
 setTestOpts([omit_ways(['ghci','threaded2']), when(fast(), skip)])
 
-hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
+hpc_prefix = "perl hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
 test('hpc_fork', [ when(opsys('mingw32'), skip), # no forkProcess on Windows
                    cmd_prefix(hpc_prefix) ], compile_and_run, ['-fhpc'])
diff --git a/tests/function/test.T b/tests/function/test.T
index 15bf7b2..a5515d9 100644
--- a/tests/function/test.T
+++ b/tests/function/test.T
@@ -1,6 +1,6 @@
 setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
-hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
+hpc_prefix = "perl hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
 test('tough',
      [cmd_prefix(hpc_prefix),
diff --git a/tests/function2/test.T b/tests/function2/test.T
index 52d78fb..b37cc40 100644
--- a/tests/function2/test.T
+++ b/tests/function2/test.T
@@ -1,6 +1,6 @@
 setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
-hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
+hpc_prefix = "perl hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
 # Test that -fhpc still works when (a) the source file is in a
 # subdirectory and (b) it is a literate file.  We had a bug in this
diff --git a/tests/raytrace/test.T b/tests/raytrace/test.T
index a65423c..2f4e51a 100644
--- a/tests/raytrace/test.T
+++ b/tests/raytrace/test.T
@@ -1,6 +1,6 @@
 setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
-hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
+hpc_prefix = "perl hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
 # TODO. It is unclear what the purpose of this test is. It produces lots of
 # output, but the expected output file is missing. I (thomie) added
diff --git a/tests/raytrace/tixs/test.T b/tests/raytrace/tixs/test.T
index 542734d..9df587f 100644
--- a/tests/raytrace/tixs/test.T
+++ b/tests/raytrace/tixs/test.T
@@ -8,13 +8,13 @@ test('hpc_report_multi_003', normal, run_command,
      ["{hpc} report hpc_sample --include=Geometry --per-module --decl-list"])
 
 test('hpc_markup_multi_001', extra_clean(['markup_multi_001/*']), run_command,
-     ["{hpc} markup --srcdir=.. --hpcdir=tixs/.hpc --hpcdir=hpc_markup_multi_001/.hpc --destdir=markup_multi_001"
+     ["{hpc} markup --hpcdir=tixs/.hpc --hpcdir=hpc_markup_multi_001/.hpc --destdir=markup_multi_001"
       " hpc_sample --include=Geometry"])
 test('hpc_markup_multi_002', extra_clean(['markup_multi_002/*']), run_command,
-     ["{hpc} markup --srcdir=.. --hpcdir=tixs/.hpc --hpcdir=hpc_markup_multi_002/.hpc --destdir=markup_multi_002"
+     ["{hpc} markup --hpcdir=tixs/.hpc --hpcdir=hpc_markup_multi_002/.hpc --destdir=markup_multi_002"
       " hpc_sample --exclude=Geometry"])
 test('hpc_markup_multi_003', extra_clean(['markup_multi_003/*']), run_command,
-     ["{hpc} markup --srcdir=.. --hpcdir=tixs/.hpc --hpcdir=hpc_markup_multi_003/.hpc --destdir=markup_multi_003"
+     ["{hpc} markup --hpcdir=tixs/.hpc --hpcdir=hpc_markup_multi_003/.hpc --destdir=markup_multi_003"
       " hpc_sample --fun-entry-count"])
 
 test('hpc_show_multi_001', normal, run_command,
diff --git a/tests/simple/test.T b/tests/simple/test.T
index 521d7bf..375a97a 100644
--- a/tests/simple/test.T
+++ b/tests/simple/test.T
@@ -1,6 +1,6 @@
 setTestOpts([omit_ways(['ghci']), when(fast(), skip)])
 
-hpc_prefix = "perl ../hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
+hpc_prefix = "perl hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 
 test('hpc001', cmd_prefix(hpc_prefix), compile_and_run, ['-fhpc'])