Multiply-timeout command

Changelog: Added `multiply_timeout` command

1 files changed, 3 insertions, 1 deletions

diff --git a/src/Run.hs b/src/Run.hs
index 2d5029d..4d68fb6 100644
--- a/src/Run.hs
+++ b/src/Run.hs
@@ -59,6 +59,7 @@ runTest out opts gdefs test = do
     failedVar <- newTVarIO Nothing
     objIdVar <- newMVar 1
     procVar <- newMVar []
+    timeoutVar <- newMVar $ optTimeout opts
 
     mgdb <- if optGDB opts
         then flip runReaderT out $ do
@@ -72,6 +73,7 @@ runTest out opts gdefs test = do
             , teOptions = opts
             , teNextObjId = objIdVar
             , teProcesses = procVar
+            , teTimeout = timeoutVar
             , teGDB = fst <$> mgdb
             }
         tstate = TestState
@@ -313,7 +315,7 @@ exprFailed desc sline pname exprVars = do
 
 expect :: SourceLine -> Process -> Traced Regex -> [TypedVarName Text] -> ([ Text ] -> TestRun ()) -> TestRun ()
 expect sline p (Traced trace re) tvars inner = do
-    timeout <- asks $ optTimeout . teOptions . fst
+    timeout <- liftIO . readMVar =<< asks (teTimeout . fst)
     delay <- liftIO $ registerDelay $ ceiling $ 1000000 * timeout
     mbmatch <- atomicallyTest $ (Nothing <$ (check =<< readTVar delay)) <|> do
         line <- readTVar (procOutput p)