summaryrefslogtreecommitdiff
path: root/testsuite/tests/concurrent
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2012-01-06 11:08:59 +0000
committerSimon Marlow <marlowsd@gmail.com>2012-01-06 11:30:31 +0000
commitd491031538d1985a37569c42450ece25e544192b (patch)
tree15371348e7d6948eecca25f7fbd220efea2fe02a /testsuite/tests/concurrent
parent13ce4f42166000ed344aa1b4d54be9401816e0c3 (diff)
downloadhaskell-d491031538d1985a37569c42450ece25e544192b.tar.gz
Skip setnumcapabilities001 if we don't have SMP support
Diffstat (limited to 'testsuite/tests/concurrent')
-rw-r--r--testsuite/tests/concurrent/should_run/all.T8
1 files changed, 7 insertions, 1 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 2e684d87f6..3e42065789 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/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, [''])