[commit: packages/hpc] master: Testsuite: only ignore stdout for T9619 and hpc_raytrace (956887d)

[git at git.haskell.org]

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

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

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

commit 956887d4a15de3e68aae82b14bfa1630c8149649
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Jun 25 00:40:11 2016 +0200

    Testsuite: only ignore stdout for T9619 and hpc_raytrace


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

956887d4a15de3e68aae82b14bfa1630c8149649
 tests/raytrace/test.T    | 4 ++--
 tests/simple/tixs/test.T | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/raytrace/test.T b/tests/raytrace/test.T
index 2f4e51a..220cf6d 100644
--- a/tests/raytrace/test.T
+++ b/tests/raytrace/test.T
@@ -4,13 +4,13 @@ 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
-# the ignore_output setup function, just to make the test pass for the
+# the ignore_stdout setup function, just to make the test pass for the
 # moment.
 # Note that the subdirectory tixs also has a test.T file, and those tests
 # depend on some of the files in this directory.
 # Also note that testsuite/tests/programs/galois_raytrace has a similar (but
 # not the same) copy of this program.
 test('hpc_raytrace',
-     [cmd_prefix(hpc_prefix), reqlib('parsec'), ignore_output],
+     [cmd_prefix(hpc_prefix), reqlib('parsec'), ignore_stdout],
      multimod_compile_and_run, ['Main','-fhpc -package parsec'])
 
diff --git a/tests/simple/tixs/test.T b/tests/simple/tixs/test.T
index a32b4a9..19fae7e 100644
--- a/tests/simple/tixs/test.T
+++ b/tests/simple/tixs/test.T
@@ -68,7 +68,7 @@ test('hpc_hand_overlay',
 
 test('hpc_bad_001', exit_code(1), run_command, ["{hpc} bad arguments"])
 
-test('T9619', ignore_output, run_command,
+test('T9619', ignore_stdout, run_command,
      # Having the same mix file in two different hpcdirs should work.
      ["{hpc} report hpc_sample.tix --hpcdir=.hpc --hpcdir=.hpc.copy"])