Skip to content

Commit c63aeb3

Browse files
committed
cleanup: undo tests workarounds for msys2-20230526
Resolves commercialhaskell#6170
1 parent 98a6cca commit c63aeb3

File tree

3 files changed

+3
-12
lines changed
  • tests/integration/tests

3 files changed

+3
-12
lines changed

tests/integration/tests/3926-ghci-with-sublibraries/Main.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ main = do
1111
copy "src-internal/Internal.v1" "src-internal/Internal.hs"
1212
stack ["build"] -- need a build before ghci at the moment, see #4148
1313
stackRepl [] $ do
14-
-- The command must be issued before searching the output for the next prompt,
15-
-- otherwise, on Windows from msys2-20230526, `stack repl` encounters a EOF
16-
-- and terminates gracefully.
17-
replCommand ":main"
1814
liftIO $ putStrLn "Awaiting prompt..."
1915
nextPrompt
2016
liftIO $ putStrLn "Initial prompt received"
17+
replCommand ":main"
2118
line <- replGetLine
2219
let expected = "hello world"
2320
when (line /= expected) $

tests/integration/tests/4270-files-order/Main.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ main :: IO ()
66
main = do
77
stack ["build"]
88
stackRepl [] $ do
9-
-- The command must be issued before searching the output for the next
10-
-- prompt, otherwise, on Windows from msys2-20230526, `stack repl`
11-
-- encounters a EOF and terminates gracefully.
12-
replCommand "putStrLn greeting"
139
nextPrompt
10+
replCommand "putStrLn greeting"
1411
line <- replGetLine
1512
let expected = "Hello, world!"
1613
when (line /= expected) $

tests/integration/tests/module-added-multiple-times/Main.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ import StackTest.Repl
33

44
main :: IO ()
55
main = stackRepl [] $ do
6-
-- The command must be issued before searching the output for the next prompt,
7-
-- otherwise, on Windows from msys2-20230526, `stack repl` encounters a EOF
8-
-- and terminates gracefully.
9-
replCommand ":main"
106
nextPrompt
7+
replCommand ":main"
118
line <- replGetLine
129
let expected = "Hello World!"
1310
when (line /= expected) $

0 commit comments

Comments
 (0)