diff options
author | Ian Lynagh <ian@well-typed.com> | 2012-10-11 13:17:55 +0100 |
---|---|---|
committer | Ian Lynagh <ian@well-typed.com> | 2012-10-11 13:20:10 +0100 |
commit | 5f4d651189ee2724f7569b9e8d71ee403ea4ba86 (patch) | |
tree | 206536bbed62358632c167139a0eeecaf29b35a7 /testsuite/tests/dph/nbody | |
parent | 4fb3f11a4bb1d5bdc8a51310c854fdae00a71356 (diff) | |
download | haskell-5f4d651189ee2724f7569b9e8d71ee403ea4ba86.tar.gz |
Let the dph tests run in parallel
With the exception of
nbody dph-nbody-copy-opt
nbody dph-nbody-vseg-opt
quickhull dph-quickhull-copy-opt
quickhull dph-quickhull-vseg-opt
words dph-words-copy-opt
words dph-words-vseg-opt
which are marked as 'high_memory_usage'
Diffstat (limited to 'testsuite/tests/dph/nbody')
-rw-r--r-- | testsuite/tests/dph/nbody/dph-nbody.T | 50 |
1 files changed, 4 insertions, 46 deletions
diff --git a/testsuite/tests/dph/nbody/dph-nbody.T b/testsuite/tests/dph/nbody/dph-nbody.T index c250f2461f..f3a1f8b024 100644 --- a/testsuite/tests/dph/nbody/dph-nbody.T +++ b/testsuite/tests/dph/nbody/dph-nbody.T @@ -1,17 +1,7 @@ test ('dph-nbody-vseg-opt' - , [ alone + , [ high_memory_usage , skip_if_fast - , extra_clean(['Main.hi', 'Main.o', - 'Body.hi', 'Body.o', - 'Config.hi', 'Config.o', - 'Dump.hi', 'Dump.o', - 'Solver.hi', 'Solver.o', - 'Util.hi', 'Util.o', - 'World.hi', 'World.o', - 'Types.hi', 'Types.o', - 'Generate.hi', 'Generate.o', - 'Randomish.hi', 'Randomish.o']) , reqlib('dph-lifted-vseg') , reqlib('dph-prim-par') , only_ways(['normal', 'threaded1', 'threaded2']) ] @@ -21,18 +11,8 @@ test ('dph-nbody-vseg-opt' test ('dph-nbody-copy-opt' - , [ alone + , [ high_memory_usage , skip_if_fast - , extra_clean(['Main.hi', 'Main.o', - 'Body.hi', 'Body.o', - 'Config.hi', 'Config.o', - 'Dump.hi', 'Dump.o', - 'Solver.hi', 'Solver.o', - 'Util.hi', 'Util.o', - 'World.hi', 'World.o', - 'Types.hi', 'Types.o', - 'Generate.hi', 'Generate.o', - 'Randomish.hi', 'Randomish.o']) , reqlib('dph-lifted-copy') , reqlib('dph-prim-par') , only_ways(['normal', 'threaded1', 'threaded2']) ] @@ -42,18 +22,7 @@ test ('dph-nbody-copy-opt' test ('dph-nbody-vseg-fast' - , [ alone - , extra_clean(['Main.hi', 'Main.o', - 'Body.hi', 'Body.o', - 'Config.hi', 'Config.o', - 'Dump.hi', 'Dump.o', - 'Solver.hi', 'Solver.o', - 'Util.hi', 'Util.o', - 'World.hi', 'World.o', - 'Types.hi', 'Types.o', - 'Generate.hi', 'Generate.o', - 'Randomish.hi', 'Randomish.o']) - , reqlib('dph-lifted-vseg') + , [ reqlib('dph-lifted-vseg') , reqlib('dph-prim-par') , only_ways(['normal', 'threaded1', 'threaded2']) ] , multimod_compile_and_run @@ -62,18 +31,7 @@ test ('dph-nbody-vseg-fast' test ('dph-nbody-copy-fast' - , [ alone - , extra_clean(['Main.hi', 'Main.o', - 'Body.hi', 'Body.o', - 'Config.hi', 'Config.o', - 'Dump.hi', 'Dump.o', - 'Solver.hi', 'Solver.o', - 'Util.hi', 'Util.o', - 'World.hi', 'World.o', - 'Types.hi', 'Types.o', - 'Generate.hi', 'Generate.o', - 'Randomish.hi', 'Randomish.o']) - , reqlib('dph-lifted-copy') + , [ reqlib('dph-lifted-copy') , reqlib('dph-prim-par') , only_ways(['normal', 'threaded1', 'threaded2']) ] , multimod_compile_and_run |