[Git][ghc/ghc][wip/T24040-ghci-timeout-squashed] Actually added the timeout test to the all.T file and fixed an overseen test probelm. :thonk:

[Hassan Al-Awwadi (@hassan.awwadi)]

Hassan Al-Awwadi pushed to branch wip/T24040-ghci-timeout-squashed at Glasgow Haskell Compiler / GHC


Commits:
ea51f6a9 by Hassan Al-Awwadi at 2024-02-05T16:39:28+01:00
Actually added the timeout test to the all.T file and fixed an overseen test probelm. :thonk:

- - - - -


3 changed files:

- ghc/GHCi/UI.hs
- testsuite/tests/ghci/scripts/T8305.script
- testsuite/tests/ghci/scripts/all.T


Changes:

=====================================
ghc/GHCi/UI.hs
=====================================
@@ -1128,9 +1128,9 @@ withTimeLimit time_out_value cmd = do
       let r = fromMaybe time_out_value result_or_timeout
       pure r where
 
-      -- | transiently duping System.Timeout(timeout), because we need a lifted version
-      -- | transiently, because really this is a dupe of time-out's Control.Timeout(timeout)
-      -- | Luckily time-out is Public Domain 😌
+      -- | transitively duping System.Timeout(timeout), because we need a lifted version
+      -- | transitively, because really this is a dupe of time-out's Control.Timeout(timeout)
+      -- | Luckily time-out is in Public Domain 😌
       timeout :: (MonadIO m, MonadCatch m) => Int -> m a -> m (Maybe a)
       timeout time action = do
         tidMain <- liftIO myThreadId


=====================================
testsuite/tests/ghci/scripts/T8305.script
=====================================
@@ -36,4 +36,4 @@
 :k ()
 
 -- 5.
-:ti ()
+:to ()


=====================================
testsuite/tests/ghci/scripts/all.T
=====================================
@@ -380,4 +380,5 @@ test('T22817', normal, ghci_script, ['T22817.script'])
 test('T22908', normal, ghci_script, ['T22908.script'])
 test('T23062', normal, ghci_script, ['T23062.script'])
 test('T16468', normal, ghci_script, ['T16468.script'])
-test('T23686', normal, ghci_script, ['T23686.script'])
\ No newline at end of file
+test('T23686', normal, ghci_script, ['T23686.script'])
+test('T24040', normal, ghci_script, ['T24040.script'])
\ No newline at end of file



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ea51f6a9367a4f430f82e3e6d6a034d34b070145

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ea51f6a9367a4f430f82e3e6d6a034d34b070145
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240205/23cb0491/attachment-0001.html>