Follow changes in the testsuite driver

compile_and_run_with_prefix -> compile_and_run and cmd_prefix

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'])
 

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'])
 

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")
 

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.