From 420ccd80d99b165ac143726b1cf9a47a3689f7f6 Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Sun, 2 Apr 2023 02:14:10 +0200
Subject: [PATCH] After moving GHC 9.4.2->9.4.4 some broken Windows tests work
Partially revert 78cbeba1a6639ae870d5f3ca03c7dd4603b2cdcb.
---
cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs | 3 ---
cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.test.hs | 3 ---
cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdClean/Script/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdRun/Script/cabal.test.hs | 3 ---
.../NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs | 3 ---
.../NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs | 3 ---
.../PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs | 3 ---
14 files changed, 42 deletions(-)
diff --git a/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs b/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs
index b492140b4e..93588d88c3 100644
--- a/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/CustomPreProcess/cabal.test.hs
@@ -1,9 +1,6 @@
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 377b4a0146..7d5d4f0aff 100644
--- a/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.test.hs
@@ -1,7 +1,4 @@
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 83177d702e..10024955a7 100644
--- a/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.test.hs
@@ -1,7 +1,4 @@
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 055979ea65..9174ba94a6 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.test.hs
@@ -1,9 +1,6 @@
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 7e4c31a6af..db31636dc4 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs
@@ -1,9 +1,6 @@
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/ScriptRerun/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs
index 863d7706ab..18c1becba4 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs
@@ -1,8 +1,5 @@
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 f54bf5a4bc..8063d22903 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs
@@ -2,9 +2,6 @@ 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 0eac6291ff..39ba5185e9 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs
@@ -2,9 +2,6 @@ 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 aa0fc3e9d2..d3870ce152 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs
@@ -1,9 +1,6 @@
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 e145dc9d86..045c88117d 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs
@@ -1,9 +1,6 @@
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/ScriptNoExtension/cabal.test.hs b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs
index e010ea6ec0..b78a6941a7 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs
@@ -1,7 +1,4 @@
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 3092a6ea57..7df7f1451b 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs
@@ -1,8 +1,5 @@
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 731fb7182d..8c92079136 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs
@@ -1,9 +1,6 @@
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 c0493cf462..e9b8f5b6c1 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.test.hs
@@ -1,9 +1,6 @@
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\""
--
GitLab