Skip to content

Commit 420ccd8

Browse files
committed
After moving GHC 9.4.2->9.4.4 some broken Windows tests work
Partially revert 78cbeba.
1 parent 2e8a1e1 commit 420ccd8

File tree

14 files changed

+0
-42
lines changed

14 files changed

+0
-42
lines changed

cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import Test.Cabal.Prelude
22
-- Test internal custom preprocessor
33
main = cabalTest $ do
4-
isWin <- isWindows
5-
ghc94 <- isGhcVersion "== 9.4.*"
6-
expectBrokenIf (isWin && ghc94) 8451 $ do
74
skipUnless "no Cabal for GHC" =<< hasCabalForGhc
85

96
-- old Cabal's ./Setup.hs output is difficult to normalise
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import Test.Cabal.Prelude
22
main = cabalTest $ do
3-
isWin <- isWindows
4-
ghc94 <- isGhcVersion "== 9.4.*"
5-
expectBrokenIf (isWin && ghc94) 8451 $ do
63
cabal "v2-build" ["foreign-opts-c-exe"]
74
withPlan $ runPlanExe "foreign-opts-c" "foreign-opts-c-exe" []
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import Test.Cabal.Prelude
22
main = cabalTest $ do
3-
isWin <- isWindows
4-
ghc94 <- isGhcVersion "== 9.4.*"
5-
expectBrokenIf (isWin && ghc94) 8451 $ do
63
cabal "v2-build" ["foreign-opts-cxx-exe"]
74
withPlan $ runPlanExe "foreign-opts-cxx" "foreign-opts-cxx-exe" []

cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs

Lines changed: 0 additions & 3 deletions
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
cabal "v2-bench"
85
[ "--benchmark-option=1"
96
, "--benchmark-options=\"2 3\""

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

Lines changed: 0 additions & 3 deletions
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
Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
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" ["with sp"] >>= assertOutputContains "Hello World"
Lines changed: 0 additions & 3 deletions
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"]
Lines changed: 0 additions & 3 deletions
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
-- script is called "s.hs" to avoid Windows long path issue in CI
85
res <- cabal' "v2-run" ["s.hs"]
96
assertOutputContains "Hello World" res

cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs

Lines changed: 0 additions & 3 deletions
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
cabal "v2-test"
85
[ "--test-option=1"
96
, "--test-options=\"2 3\""

0 commit comments

Comments
 (0)