summaryrefslogtreecommitdiff
path: root/testsuite/tests/ghc-regress/concurrent/should_run
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2010-10-14 08:46:23 +0000
committerSimon Marlow <marlowsd@gmail.com>2010-10-14 08:46:23 +0000
commiteabdad37c62c7c5e474cc4d2ceecbaf69414b36f (patch)
tree555ca19e69751d635819d3f3344b5e3eef350d49 /testsuite/tests/ghc-regress/concurrent/should_run
parent5a1f8106f173d6110d1dff29a003a0ab826dd422 (diff)
downloadhaskell-eabdad37c62c7c5e474cc4d2ceecbaf69414b36f.tar.gz
omit conc068(threaded2), it is non-deterministic
Diffstat (limited to 'testsuite/tests/ghc-regress/concurrent/should_run')
-rw-r--r--testsuite/tests/ghc-regress/concurrent/should_run/all.T5
1 files changed, 4 insertions, 1 deletions
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/all.T b/testsuite/tests/ghc-regress/concurrent/should_run/all.T
index 4297303e23..4385b6b525 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/all.T
+++ b/testsuite/tests/ghc-regress/concurrent/should_run/all.T
@@ -178,5 +178,8 @@ test('conc064',
test('conc065', ignore_output, compile_and_run, [''])
test('conc066', ignore_output, compile_and_run, [''])
test('conc067', ignore_output, compile_and_run, [''])
-test('conc068', exit_code(1), compile_and_run, [''])
+
+# omit threaded2, the behaviour of this test is non-deterministic with more
+# than one CPU.
+test('conc068', [ omit_ways('threaded2'), exit_code(1) ], compile_and_run, [''])