diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2015-07-06 11:19:30 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-07-06 11:19:30 +0200 |
| commit | 10a7c139e5fc72641f629fafbccaf5cd77cdf966 (patch) | |
| tree | 51a0eaa64d0d14430bb0683585ada0247c2b129f | |
| parent | 4816feab0def73e85825216eb49d58eb0de3d43d (diff) | |
| download | haskell-ghc-7.8.tar.gz | |
Revert "testsuite/T9379: Use GHC.Conc instead of Control.Concurrent.STM"ghc-7.8
This reverts commit be8556ff4ce8039a6cad59db9fe37ac971d6a31e which was
accidentally pushed.
| -rw-r--r-- | testsuite/tests/concurrent/should_run/T9379.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/testsuite/tests/concurrent/should_run/T9379.hs b/testsuite/tests/concurrent/should_run/T9379.hs index 235b2aa58e..49e6d1eaed 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 |