diff --git a/cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs b/cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs index 7c01bcef821..14d2ae5429a 100644 --- a/cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs +++ b/cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs @@ -6,14 +6,16 @@ import Test.Cabal.Prelude main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 8.8" isWin <- isWindows + ghc94 <- isGhcVersion "== 9.4.1" env <- getTestEnv let pwd = testCurrentDir env customCC = pwd ++ "/custom-cc" ++ if isWin then ".bat" else "" - setup "configure" - [ "--ghc-option=-DNOERROR1" - , "--ghc-option=-optc=-DNOERROR2" - , "--ghc-option=-optP=-DNOERROR3" - , "--with-gcc=" ++ customCC - ] - setup "build" ["-v2"] + expectBrokenIf (isWin && ghc94) 8451 $ + setup "configure" + [ "--ghc-option=-DNOERROR1" + , "--ghc-option=-optc=-DNOERROR2" + , "--ghc-option=-optP=-DNOERROR3" + , "--with-gcc=" ++ customCC + ] + setup "build" ["-v2"] diff --git a/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs b/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs index a7d8ad0a0f1..2dd5bf7e811 100644 --- a/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs +++ b/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs @@ -26,9 +26,9 @@ import Test.Cabal.Prelude main = setupAndCabalTest . recordMode DoNotRecord $ do -- Foreign libraries don't work with GHC 7.6 and earlier skipUnlessGhcVersion ">= 7.8" - osx <- isOSX - ghc80 <- isGhcVersion "== 8.0.2" - expectBrokenIf (osx && ghc80) 7989 $ + win <- isWindows + ghc94 <- isGhcVersion "== 9.4.1" + expectBrokenIf (win && ghc94) 8451 $ withPackageDb $ do setup_install [] setup "copy" [] -- regression test #4156