summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-06-09 10:01:12 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-06-10 04:17:36 -0400
commit8d07c48ce3fde32a3c08c84764e0859b84eee461 (patch)
treeed4fc6d75221aeaf2746663ef4f5a129f4e6ba4f /testsuite
parent9b283e1b2a46af614d89b0e3a0dfd23871511c17 (diff)
downloadhaskell-8d07c48ce3fde32a3c08c84764e0859b84eee461.tar.gz
test: fix conc038
We had spurious failures of conc038 test on CI with stdout: ``` newThread started -mainThread -Haskell: 2 newThread back again +mainThread 1 sec later shutting down +Haskell: 2 ```
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/concurrent/should_run/conc038.hs4
-rw-r--r--testsuite/tests/concurrent/should_run/conc038.stdout2
2 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/concurrent/should_run/conc038.hs b/testsuite/tests/concurrent/should_run/conc038.hs
index bf7fd6d261..5534646c76 100644
--- a/testsuite/tests/concurrent/should_run/conc038.hs
+++ b/testsuite/tests/concurrent/should_run/conc038.hs
@@ -24,9 +24,9 @@ main = do
th <- newEmptyMVar
forkIO $ do
putStrLn "newThread started"
- sleepBlock 1
+ sleepBlock 2
putStrLn "newThread back again"
- putMVar th "1 sec later"
+ putMVar th "2 secs later"
threadDelay 500000 >> putStrLn "mainThread"
-- this will not be blocked in the threaded RTS
forkIO $ (hFun 2)
diff --git a/testsuite/tests/concurrent/should_run/conc038.stdout b/testsuite/tests/concurrent/should_run/conc038.stdout
index 21fc15c4e2..88299dfcc3 100644
--- a/testsuite/tests/concurrent/should_run/conc038.stdout
+++ b/testsuite/tests/concurrent/should_run/conc038.stdout
@@ -2,6 +2,6 @@ newThread started
mainThread
Haskell: 2
newThread back again
-1 sec later
+2 secs later
shutting down