[commit: testsuite] master: Skip setnumcapabilities001 if we don't have SMP support (34a98a8)
Simon Marlow
marlowsd at gmail.com
Fri Jan 6 13:15:56 CET 2012
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/34a98a863a9d3ff7a37b1f6eedf63ee355d0daf8
>---------------------------------------------------------------
commit 34a98a863a9d3ff7a37b1f6eedf63ee355d0daf8
Author: Simon Marlow <marlowsd at gmail.com>
Date: Fri Jan 6 11:08:59 2012 +0000
Skip setnumcapabilities001 if we don't have SMP support
>---------------------------------------------------------------
tests/concurrent/should_run/all.T | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/tests/concurrent/should_run/all.T b/tests/concurrent/should_run/all.T
index 2e684d8..3e42065 100644
--- a/tests/concurrent/should_run/all.T
+++ b/tests/concurrent/should_run/all.T
@@ -210,8 +210,14 @@ test('conc067', ignore_output, compile_and_run, [''])
# than one CPU.
test('conc068', [ omit_ways('threaded2'), exit_code(1) ], compile_and_run, [''])
+if (ghc_with_smp == 0):
+ skip_if_not_smp = skip
+else:
+ skip_if_not_smp = normal
+
test('setnumcapabilities001',
[ only_ways(['threaded1','threaded2']),
extra_run_opts('4 12 2000'),
- reqlib('parallel') ],
+ reqlib('parallel'),
+ skip_if_not_smp ],
compile_and_run, [''])
More information about the Cvs-ghc
mailing list