From f76d2ab735bb63babd40d56e6c02284ad16db1e5 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Fri, 23 Nov 2007 18:53:38 +0000
Subject: [PATCH] Follow changes in the testsuite driver
compile_and_run_with_prefix -> compile_and_run and cmd_prefix
---
tests/fork/test.T | 4 ++--
tests/function/test.T | 4 ++--
tests/raytrace/test.T | 7 ++++---
tests/simple/test.T | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/fork/test.T b/tests/fork/test.T
index 8feb3a8..3c6b112 100644
--- a/tests/fork/test.T
+++ b/tests/fork/test.T
@@ -5,7 +5,7 @@ setTestOpts(compose(only_compiler_types(['ghc']),
# Set up the hpc common variable(s).
hpc = config.top + '/../utils/hpc/hpc'
-hpc_args = ['perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc,'-fhpc'];
+hpc_prefix = 'perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc;
-test('hpc_fork', normal, compile_and_run_with_prefix, hpc_args)
+test('hpc_fork', cmd_prefix(hpc_prefix), compile_and_run, ['-fhpc'])
diff --git a/tests/function/test.T b/tests/function/test.T
index 17bd89e..a898393 100644
--- a/tests/function/test.T
+++ b/tests/function/test.T
@@ -5,7 +5,7 @@ setTestOpts(compose(only_compiler_types(['ghc']),
# Set up the hpc common variable(s).
hpc = config.top + '/../utils/hpc/hpc'
-hpc_args = ['perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc,'-fhpc'];
+hpc_prefix = 'perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc;
-test('tough', normal, compile_and_run_with_prefix, hpc_args)
+test('tough', cmd_prefix(hpc_prefix), compile_and_run, ['-fhpc'])
diff --git a/tests/raytrace/test.T b/tests/raytrace/test.T
index 70e18f1..3ae9141 100644
--- a/tests/raytrace/test.T
+++ b/tests/raytrace/test.T
@@ -3,11 +3,12 @@ setTestOpts(compose(only_compiler_types(['ghc']),
skip_if_fast)))
hpc = config.top + '/../utils/hpc/hpc';
+hpc_prefix = 'perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc, 'Main'
test('hpc_raytrace', \
- skip_if_fast, \
- multimod_compile_and_run_with_prefix, \
- ['perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc, 'Main','-fhpc -package parsec'])
+ compose(skip_if_fast, cmd_prefix(hpc_prefix)), \
+ multimod_compile_and_run, \
+ ['Main','-fhpc -package parsec'])
runCmd("cd " + getTestDir() + " && tar xf tixs.tar")
diff --git a/tests/simple/test.T b/tests/simple/test.T
index 4775c36..f747f90 100644
--- a/tests/simple/test.T
+++ b/tests/simple/test.T
@@ -5,9 +5,9 @@ setTestOpts(compose(only_compiler_types(['ghc']),
# Set up the hpc common variable(s).
hpc = config.top + '/../utils/hpc/hpc'
-hpc_args = ['perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc,'-fhpc'];
+hpc_prefix = 'perl ../hpcrun.pl --clear --exeext=' + config.exeext + ' --hpc=' + hpc;
-test('hpc001', normal, compile_and_run_with_prefix, hpc_args)
+test('hpc001', cmd_prefix(hpc_prefix), compile_and_run, ['-fhpc'])
# a prepackaged version of .hpc/*mix and hpc-sample.tix files.
# This is created using 'make build-tix-tar', in this directory.
--
GitLab