new-old test failures on Windows (tracking: haskell#8451)

ulysses4ever · Nov 13, 2023 · c3067d7 · c3067d7
1 parent 399490c
commit c3067d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs b/cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs
@@ -7,11 +7,12 @@ main = setupAndCabalTest $ do
   skipUnlessGhcVersion ">= 8.8"
   isWin <- isWindows
   ghc94 <- isGhcVersion "== 9.4.*"
+  ghc98 <- isGhcVersion "== 9.8.*"
   env   <- getTestEnv
   let pwd      = testCurrentDir env
       customCC = pwd ++ "/custom-cc" ++ if isWin then ".bat" else ""
 
-  expectBrokenIf (isWin && ghc94) 8451 $ do
+  expectBrokenIf (isWin && (ghc94 || ghc98)) 8451 $ do
     setup "configure"
       [ "--ghc-option=-DNOERROR1"
       , "--ghc-option=-optc=-DNOERROR2"

diff --git a/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs b/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs
@@ -28,7 +28,8 @@ main = setupAndCabalTest . recordMode DoNotRecord $ do
   skipUnlessGhcVersion ">= 7.8"
   win <- isWindows
   ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (win && ghc94) 8451 $
+  ghc98 <- isGhcVersion "== 9.8.*"
+  expectBrokenIf (win && (ghc94 || ghc98)) 8451 $ do
     withPackageDb $ do
         setup_install []
         setup "copy" [] -- regression test #4156