Skip to content

Commit 46a52f1

Browse files
committed
more Windows tests failing on GHC 9.4 marked broken
1 parent 3077356 commit 46a52f1

File tree

14 files changed

+21
-21
lines changed

14 files changed

+21
-21
lines changed

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

-3
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
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" []
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

-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
cabal "v2-bench"
85
[ "--benchmark-option=1"
96
, "--benchmark-options=\"2 3\""

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
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
47
cabal' "v2-build" ["script.hs"]
58

69
env <- getTestEnv
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
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
47
cabal' "v2-build" ["script.hs"]
58
cabal' "v2-build" ["script.hs"]

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

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ 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
58
env <- getTestEnv
69
let td = testCurrentDir env
710

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

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ 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
58
env <- getTestEnv
69
let td = testCurrentDir env
710

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
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
47
cabal' "v2-build" ["script.hs"]
58
cabal' "v2-clean" ["script.hs"]
69

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

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

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

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"
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
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
47
cabal' "v2-run" ["script.hs"]
58
cabal' "v2-run" ["script.hs"]
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

-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
cabal "v2-test"
85
[ "--test-option=1"
96
, "--test-options=\"2 3\""

0 commit comments

Comments
 (0)