Skip to content

Commit 74f21bd

Browse files
committed
After moving GHC 9.4.2->9.4.4 some broken Windows tests work
Partially revert 78cbeba.
1 parent 46a52f1 commit 74f21bd

File tree

10 files changed

+0
-30
lines changed

10 files changed

+0
-30
lines changed

cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest . void $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
cabal' "v2-build" ["script.hs"]
85

96
env <- getTestEnv
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest . void $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
cabal' "v2-build" ["script.hs"]
85
cabalWithStdin "v2-repl" ["script.hs"] ""
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest . void $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
cabal' "v2-build" ["script.hs"]
85
cabal' "v2-run" ["script.hs"]
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest . void $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
cabal' "v2-build" ["script.hs"]
85
cabal' "v2-build" ["script.hs"]

cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ import Test.Cabal.Prelude
22
import System.Directory (copyFile, removeFile)
33

44
main = cabalTest . void $ do
5-
isWin <- isWindows
6-
ghc94 <- isGhcVersion "== 9.4.*"
7-
expectBrokenIf (isWin && ghc94) 8451 $ do
85
env <- getTestEnv
96
let td = testCurrentDir env
107

cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ import Test.Cabal.Prelude
22
import System.Directory (copyFile, removeFile)
33

44
main = cabalTest . void $ do
5-
isWin <- isWindows
6-
ghc94 <- isGhcVersion "== 9.4.*"
7-
expectBrokenIf (isWin && ghc94) 8451 $ do
85
env <- getTestEnv
96
let td = testCurrentDir env
107

cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest . void $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
cabal' "v2-build" ["script.hs"]
85
cabal' "v2-clean" ["script.hs"]
96

cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
res <- cabal' "v2-run" ["script.hs"]
85
assertOutputContains "Hello World" res
96

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
res <- cabal' "v2-run" ["script.lhs"]
85
assertOutputContains "Hello World" res
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import Test.Cabal.Prelude
22

33
main = cabalTest . void $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
cabal' "v2-run" ["script.hs"]
85
cabal' "v2-run" ["script.hs"]

0 commit comments

Comments
 (0)