diff --git a/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs b/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs index 93588d88c3f9b9efca7be9632d51d8325892c992..b492140b4ed55f630a29e8637d571e52fa70f1a8 100644 --- a/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs +++ b/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs @@ -1,6 +1,9 @@ import Test.Cabal.Prelude -- Test internal custom preprocessor main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do skipUnless "no Cabal for GHC" =<< hasCabalForGhc -- old Cabal's ./Setup.hs output is difficult to normalise diff --git a/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.test.hs b/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.test.hs index 7d5d4f0aff957886b388cc829ada0ccb1436c9a8..377b4a014665646b900df97ea750bc627e6660d5 100644 --- a/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.test.hs +++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.test.hs @@ -1,4 +1,7 @@ import Test.Cabal.Prelude main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal "v2-build" ["foreign-opts-c-exe"] withPlan $ runPlanExe "foreign-opts-c" "foreign-opts-c-exe" [] diff --git a/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.test.hs b/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.test.hs index 10024955a781aee573a3ff90d0a337423675f38f..83177d702e36912f469b8770bba9661d6cc184ee 100644 --- a/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.test.hs +++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.test.hs @@ -1,4 +1,7 @@ import Test.Cabal.Prelude main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal "v2-build" ["foreign-opts-cxx-exe"] withPlan $ runPlanExe "foreign-opts-cxx" "foreign-opts-cxx-exe" [] diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs index 9174ba94a6cefdfb932ee6b68fafa2ce1d13e153..055979ea65cd6475559271f86f7cd79fb3efdd58 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs @@ -1,6 +1,9 @@ import Test.Cabal.Prelude main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal "v2-bench" [ "--benchmark-option=1" , "--benchmark-options=\"2 3\"" diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs index db31636dc42af187e75d86dc7ce51e8e7ad95e07..7e4c31a6af7a8c934d010c04fd8a03d62fd24800 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs @@ -1,6 +1,9 @@ import Test.Cabal.Prelude main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal' "v2-build" ["script.hs"] env <- getTestEnv diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.test.hs index 9c0f021da5dd65010d30fae2835fcea859989b80..f09f7f8a4fa834fa82d2dfbe8d4ea61fd7019420 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.test.hs @@ -1,5 +1,8 @@ import Test.Cabal.Prelude main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal' "v2-build" ["script.hs"] cabalWithStdin "v2-repl" ["script.hs"] "" diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.test.hs index e46b56d4afd22fa296993b4116503c7b99f5a51d..23d49e3f73f360ace0a4db09b231e4efbce264eb 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.test.hs @@ -1,5 +1,8 @@ import Test.Cabal.Prelude main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal' "v2-build" ["script.hs"] cabal' "v2-run" ["script.hs"] diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs index 18c1becba42297c1d0aa3a1b1d0867779ce58d4c..863d7706ab2a7650029d1940baa2cb3b711c5168 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs @@ -1,5 +1,8 @@ import Test.Cabal.Prelude main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal' "v2-build" ["script.hs"] cabal' "v2-build" ["script.hs"] diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs index 8063d229034d5146b810af011b8bde4c953a6396..f54bf5a4bcf16d73cdd84958ece797688371fc41 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs @@ -2,6 +2,9 @@ import Test.Cabal.Prelude import System.Directory (copyFile, removeFile) main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do env <- getTestEnv let td = testCurrentDir env diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs index 39ba5185e94a6b395cc34b22c852b91e6053b396..0eac6291ff2d5002df1f3179dbd70a8210db51d9 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs @@ -2,6 +2,9 @@ import Test.Cabal.Prelude import System.Directory (copyFile, removeFile) main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do env <- getTestEnv let td = testCurrentDir env diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs index d3870ce1520e3f36fdf97edc21323d048c848729..aa0fc3e9d2f4b83a525fdf79ed28645b8e9d3c14 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs @@ -1,6 +1,9 @@ import Test.Cabal.Prelude main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal' "v2-build" ["script.hs"] cabal' "v2-clean" ["script.hs"] diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs index 045c88117d7f28b1fb67673948163290e0c4d8c9..e145dc9d8639726e1dcd4f29b1ae3e4f638a7a30 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs @@ -1,6 +1,9 @@ import Test.Cabal.Prelude main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do res <- cabal' "v2-run" ["script.hs"] assertOutputContains "Hello World" res diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.test.hs index 64c858e8d0da597c7884dbfadc658e9ce172a3a3..1754c7cb4a559054e2510fe9577e7bc499cc31bc 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.test.hs @@ -1,5 +1,8 @@ import Test.Cabal.Prelude main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do res <- cabal' "v2-run" ["script.lhs"] assertOutputContains "Hello World" res diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs index b78a6941a798ced23314e755f94fa9ef17173ded..e010ea6ec05ce4a8cad9e592345ea170e374a598 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs @@ -1,4 +1,7 @@ import Test.Cabal.Prelude main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal' "v2-run" ["with sp"] >>= assertOutputContains "Hello World" diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs index 7df7f1451bc0c43f8a1b04be3e1ce6e542683d77..3092a6ea57bfc83ddf0f6d3a9ef29314668b418e 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs @@ -1,5 +1,8 @@ import Test.Cabal.Prelude main = cabalTest . void $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal' "v2-run" ["script.hs"] cabal' "v2-run" ["script.hs"] diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs index 8c92079136ba39f44b70c959426b17a0b833bc48..731fb7182da4fba0ad0b677a39e9418ca4956daa 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs @@ -1,6 +1,9 @@ import Test.Cabal.Prelude main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do -- script is called "s.hs" to avoid Windows long path issue in CI res <- cabal' "v2-run" ["s.hs"] assertOutputContains "Hello World" res diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs index e9b8f5b6c124fe6992354f0d20f7dc2e0f5c32f4..c0493cf462968f7e134466c37c8b1f7010be6c6c 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs @@ -1,6 +1,9 @@ import Test.Cabal.Prelude main = cabalTest $ do + isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.*" + expectBrokenIf (isWin && ghc94) 8451 $ do cabal "v2-test" [ "--test-option=1" , "--test-options=\"2 3\""