Skip to content

Commit fbeb0a1

Browse files
committed
Mark several failing test cases as "expected broken"
Failures are tracked in issues #7610 #7987 #7989 #8028 #8032
1 parent 7dba4e5 commit fbeb0a1

File tree

7 files changed

+28
-9
lines changed

7 files changed

+28
-9
lines changed

cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
3-
skipUnlessGhcVersion ">= 8.1"
3+
skipUnlessGhcVersion ">= 8.1"
4+
ghc <- isGhcVersion "== 9.0.2 || == 9.2.1"
5+
expectBrokenIf ghc 7987 $ do
46
withPackageDb $ do
57
withDirectory "mylib" $ setup_install_with_docs ["--ipid", "mylib-0.1.0.0"]
68
withDirectory "mysql" $ setup_install_with_docs ["--ipid", "mysql-0.1.0.0"]

cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import Test.Cabal.Prelude
22
main = setupTest $ do
3-
-- No cabal test because per-component is broken with it
4-
skipUnlessGhcVersion ">= 8.1"
3+
-- No cabal test because per-component is broken with it
4+
skipUnlessGhcVersion ">= 8.1"
5+
ghc <- isGhcVersion "== 9.0.2 || == 9.2.1"
6+
expectBrokenIf ghc 7987 $
57
withPackageDb $ do
68
let setup_install' args = setup_install_with_docs (["--cabal-file", "Includes2.cabal"] ++ args)
79
setup_install' ["mylib", "--cid", "mylib-0.1.0.0"]

cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import Test.Cabal.Prelude
22
import Data.List
33
import qualified Data.Char as Char
44
main = setupAndCabalTest $ do
5-
skipUnlessGhcVersion ">= 8.1"
5+
skipUnlessGhcVersion ">= 8.1"
6+
ghc <- isGhcVersion "== 9.0.2 || == 9.2.1"
7+
expectBrokenIf ghc 7987 $
68
withPackageDb $ do
79
containers_id <- getIPID "containers"
810
withDirectory "repo/sigs-0.1.0.0" $ setup_install_with_docs ["--ipid", "sigs-0.1.0.0"]

cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ import Test.Cabal.Prelude
2424
-- Recording is turned off because versionedlib will or will not
2525
-- be installed depending on if we're on Linux or not.
2626
main = setupAndCabalTest . recordMode DoNotRecord $ do
27-
-- Foreign libraries don't work with GHC 7.6 and earlier
28-
skipUnlessGhcVersion ">= 7.8"
27+
-- Foreign libraries don't work with GHC 7.6 and earlier
28+
skipUnlessGhcVersion ">= 7.8"
29+
osx <- isOSX
30+
ghc <- isGhcVersion "== 8.0.2"
31+
expectBrokenIf (osx && ghc) 7989 $
2932
withPackageDb $ do
3033
setup_install []
3134
setup "copy" [] -- regression test #4156
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
import Test.Cabal.Prelude
22
main = cabalTest $ do
3+
missesProfiling <- isGhcVersion ">= 9.2.1"
4+
osx <- isOSX
5+
missesProfilingOsx <- isGhcVersion ">= 8.10.7"
6+
expectBrokenIf (missesProfiling || osx && missesProfilingOsx) 8032 $
37
cabal "v2-build" ["exe:q"]

cabal-testsuite/PackageTests/Regression/T4025/setup.test.hs

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import Test.Cabal.Prelude
33
-- an executable RPATH. Don't test on Windows, which doesn't
44
-- support RPATH.
55
main = setupAndCabalTest $ do
6-
skipIfWindows
6+
skipIfWindows
7+
osx <- isOSX
8+
ghc <- isGhcVersion ">= 8.10.7"
9+
expectBrokenIf (osx && ghc) 7610 $ do -- see also issue #7988
710
setup "configure" ["--enable-executable-dynamic"]
811
setup "build" []
912
-- This should fail as it we should NOT be able to find the

cabal-testsuite/PackageTests/Regression/T4270/setup.test.hs

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ main = setupAndCabalTest $ do
66
skipUnless "no shared libs" =<< hasSharedLibraries
77
skipUnless "no shared Cabal" =<< hasCabalShared
88
skipUnless "no Cabal for GHC" =<< hasCabalForGhc
9-
setup_build ["--enable-tests", "--enable-executable-dynamic"]
10-
setup "test" []
9+
ghc <- isGhcVersion "== 8.0.2"
10+
osx <- isOSX
11+
expectBrokenIf (osx && ghc) 8028 $ do
12+
setup_build ["--enable-tests", "--enable-executable-dynamic"]
13+
setup "test" []

0 commit comments

Comments
 (0)