[commit: packages/hpc] master: Tests: don't write to the same file from multiple tests (5ae4275)

[git at git.haskell.org]

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

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

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

commit 5ae4275dd8e6c2242c299cc0b8c396564389f2c2
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Aug 27 09:26:52 2015 +0200

    Tests: don't write to the same file from multiple tests


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

5ae4275dd8e6c2242c299cc0b8c396564389f2c2
 tests/raytrace/tixs/test.T | 19 +++++++++----------
 tests/simple/tixs/test.T   | 10 ++++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/raytrace/tixs/test.T b/tests/raytrace/tixs/test.T
index f558741..0a9428e 100644
--- a/tests/raytrace/tixs/test.T
+++ b/tests/raytrace/tixs/test.T
@@ -9,18 +9,17 @@ test('hpc_report_multi_002', normal, run_command,
 test('hpc_report_multi_003', normal, run_command,
      ["{hpc} report hpc_sample --include=Geometry --per-module --decl-list"])
 
-test('hpc_markup_multi_001', normal, run_command,
-  ["{hpc} markup --srcdir=.. --hpcdir=tixs/.hpc hpc_sample --include=Geometry"])
-test('hpc_markup_multi_002', normal, run_command,
-  ["{hpc} markup --srcdir=.. --hpcdir=tixs/.hpc hpc_sample --exclude=Geometry"])
-test('hpc_markup_multi_003', normal, run_command,
-  ["{hpc} markup --srcdir=.. --hpcdir=tixs/.hpc hpc_sample --fun-entry-count"])
+test('hpc_markup_multi_001', extra_clean(['markup_multi_001/*']), run_command,
+     ["{hpc} markup --srcdir=.. --hpcdir=tixs/.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 --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 --destdir=markup_multi_003"
+      " hpc_sample --fun-entry-count"])
 
 test('hpc_show_multi_001', normal, run_command,
      ["{hpc} show hpc_sample"])
 test('hpc_show_multi_002', normal, run_command,
      ["{hpc} show hpc_sample --include=Geometry"])
-
-# XXX We used to do clean_o_hi(), but that doesn't work any more
-# Fix cleaning properly
-
diff --git a/tests/simple/tixs/test.T b/tests/simple/tixs/test.T
index f1e82ef..71c9ad5 100644
--- a/tests/simple/tixs/test.T
+++ b/tests/simple/tixs/test.T
@@ -22,10 +22,12 @@ test('hpc_markup_error_001', exit_code(1), run_command,
      ["{hpc} markup"]) # no .tix file
 test('hpc_markup_error_002', exit_code(1), run_command,
      ["{hpc} markup hpc001.hs"]) # bad .tix file
-test('hpc_markup_001', normal, run_command,
-     ["{hpc} markup --verbosity=0 hpc_sample.tix --highlight-covered; cat Main.hs.html"])
-test('hpc_markup_002', normal, run_command,
-     ["{hpc} markup --verbosity=0 hpc_sample.tix --fun-entry-count; cat Main.hs.html"])
+test('hpc_markup_001', extra_clean(['markup_001/*']), run_command,
+     ["{hpc} markup --verbosity=0 --destdir=markup_001"
+      " hpc_sample.tix --highlight-covered; cat markup_001/Main.hs.html"])
+test('hpc_markup_002', extra_clean(['markup_002/*']), run_command,
+     ["{hpc} markup --verbosity=0 --destdir=markup_002"
+      " hpc_sample.tix --fun-entry-count; cat markup_002/Main.hs.html"])
 
 test('hpc_help_show', normal, run_command, ["{hpc} help show"])
 test('hpc_show', normal, run_command, ["{hpc} show hpc_sample.tix"])