summaryrefslogtreecommitdiff
path: root/testsuite/tests/concurrent
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2011-08-03 15:13:53 +0100
committerSimon Marlow <marlowsd@gmail.com>2011-08-04 09:33:04 +0100
commit25d4863492fd8ffa987c1487549351d786e58895 (patch)
treeb0b5d84d3beedf4f3ba20a8b9b0b7492662b225f /testsuite/tests/concurrent
parent6339c4db10fd35abecaadd9fbb2303c947402cd9 (diff)
downloadhaskell-25d4863492fd8ffa987c1487549351d786e58895.tar.gz
fix an unexpected pass
Diffstat (limited to 'testsuite/tests/concurrent')
-rw-r--r--testsuite/tests/concurrent/should_run/all.T2
-rw-r--r--testsuite/tests/concurrent/should_run/throwto002.hs2
-rw-r--r--testsuite/tests/concurrent/should_run/throwto002.stdout1
3 files changed, 3 insertions, 2 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index cdcbd6da68..f7745d5d97 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -36,7 +36,7 @@ test('4030', omit_ways('ghci'), compile_and_run, ['-O'])
# each of these runs for about a second
test('throwto001', [reqlib('random'), extra_run_opts('1000 2000')],
compile_and_run, [''])
-test('throwto002', [reqlib('random'), ignore_output], compile_and_run, [''])
+test('throwto002', [reqlib('random')], compile_and_run, [''])
test('throwto003', normal, compile_and_run, [''])
test('mask001', normal, compile_and_run, [''])
diff --git a/testsuite/tests/concurrent/should_run/throwto002.hs b/testsuite/tests/concurrent/should_run/throwto002.hs
index c9857f1f1e..98c9f1f7a1 100644
--- a/testsuite/tests/concurrent/should_run/throwto002.hs
+++ b/testsuite/tests/concurrent/should_run/throwto002.hs
@@ -15,7 +15,7 @@ main = do
t1 <- block $ forkIO (thread r t2)
t2 <- block $ forkIO (thread r t1)
threadDelay 1000000
- readIORef r >>= print
+ readIORef r >>= print . (/= 0)
thread r t = run
where
diff --git a/testsuite/tests/concurrent/should_run/throwto002.stdout b/testsuite/tests/concurrent/should_run/throwto002.stdout
new file mode 100644
index 0000000000..0ca95142bb
--- /dev/null
+++ b/testsuite/tests/concurrent/should_run/throwto002.stdout
@@ -0,0 +1 @@
+True