[commit: ghc] master: testsuite/T9379: Use GHC.Conc instead of Control.Concurrent.STM (88b1f99)

git at git.haskell.org git at git.haskell.org
Tue Aug 19 04:34:16 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/88b1f99d473e5588378699abeb203c39ea554334/ghc

>---------------------------------------------------------------

commit 88b1f99d473e5588378699abeb203c39ea554334
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Aug 18 21:40:21 2014 -0500

    testsuite/T9379: Use GHC.Conc instead of Control.Concurrent.STM
    
    Summary:
    `GHC.Conc` provides almost everything we need.
    
    Signed-off-by: Ben Gamari <bgamari.foss at gmail.com>
    
    Test Plan:
        make test TEST=T9379
    
    Reviewers: austin, simonmar
    
    Reviewed By: austin, simonmar
    
    Subscribers: phaskell, simonmar, relrod, ezyang, carter
    
    Differential Revision: https://phabricator.haskell.org/D152


>---------------------------------------------------------------

88b1f99d473e5588378699abeb203c39ea554334
 testsuite/tests/concurrent/should_run/T9379.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/concurrent/should_run/T9379.hs b/testsuite/tests/concurrent/should_run/T9379.hs
index 49e6d1e..235b2aa 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 Control.Concurrent.STM
+import GHC.Conc
 import Foreign.StablePtr
 
 main :: IO ()
@@ -10,6 +10,8 @@ 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