Skip to content

Commit

Permalink
mark failing Windows tests as broken
Browse files Browse the repository at this point in the history
Tracked as haskell#8451.

ForeignLibs test was marked as broken on Mac for GHC 8.0 but we dropped
8.0 support, so that info was removed.
  • Loading branch information
ulysses4ever committed Sep 4, 2022
1 parent 7b502cf commit 1526374
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
16 changes: 9 additions & 7 deletions cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 3 additions & 3 deletions cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1526374

Please sign in to comment.