[commit: ghc] ghc-7.8: Revert "testsuite/T9379: Use GHC.Conc instead of Control.Concurrent.STM" (10a7c13)
git at git.haskell.org
git at git.haskell.org
Mon Jul 6 09:18:58 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-7.8
Link : http://ghc.haskell.org/trac/ghc/changeset/10a7c139e5fc72641f629fafbccaf5cd77cdf966/ghc
>---------------------------------------------------------------
commit 10a7c139e5fc72641f629fafbccaf5cd77cdf966
Author: Ben Gamari <ben at smart-cactus.org>
Date: Mon Jul 6 11:19:30 2015 +0200
Revert "testsuite/T9379: Use GHC.Conc instead of Control.Concurrent.STM"
This reverts commit be8556ff4ce8039a6cad59db9fe37ac971d6a31e which was
accidentally pushed.
>---------------------------------------------------------------
10a7c139e5fc72641f629fafbccaf5cd77cdf966
testsuite/tests/concurrent/should_run/T9379.hs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/testsuite/tests/concurrent/should_run/T9379.hs b/testsuite/tests/concurrent/should_run/T9379.hs
index 235b2aa..49e6d1e 100644
--- a/testsuite/tests/concurrent/should_run/T9379.hs
+++ b/testsuite/tests/concurrent/should_run/T9379.hs
@@ -1,6 +1,6 @@
import Control.Exception
import Control.Concurrent
-import GHC.Conc
+import Control.Concurrent.STM
import Foreign.StablePtr
main :: IO ()
@@ -10,8 +10,6 @@ main = do
t <- mask_ $ forkIO (blockSTM tv)
killThread t
-check b = if b then return () else retry
-
blockSTM :: TVar Bool -> IO ()
blockSTM tv = do
atomically $ do
More information about the ghc-commits
mailing list