From 973528d198279b03766e5ea609b3169d0b9b9658 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Mon, 28 Feb 2022 19:50:44 +0100 Subject: [PATCH] Skip several failing test cases Failures are tracked in issues https://github.com/haskell/cabal/issues/7610 https://github.com/haskell/cabal/issues/7987 https://github.com/haskell/cabal/issues/7989 --- .../PackageTests/Backpack/Includes2/setup-external.test.hs | 1 + .../Backpack/Includes2/setup-per-component.test.hs | 1 + .../Backpack/Includes3/setup-external-ok.test.hs | 1 + cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs | 6 ++++++ cabal-testsuite/PackageTests/Regression/T4025/setup.test.hs | 6 ++++++ 5 files changed, 15 insertions(+) diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs index 33f813a5eef..64c29805a08 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs @@ -1,6 +1,7 @@ import Test.Cabal.Prelude main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 8.1" + skipIfGhcVersion "== 9.0.2 || == 9.2.1" -- https://github.com/haskell/cabal/issues/7987 withPackageDb $ do withDirectory "mylib" $ setup_install_with_docs ["--ipid", "mylib-0.1.0.0"] withDirectory "mysql" $ setup_install_with_docs ["--ipid", "mysql-0.1.0.0"] diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs index cfb08f33ed1..73f45cc0e4a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs @@ -2,6 +2,7 @@ import Test.Cabal.Prelude main = setupTest $ do -- No cabal test because per-component is broken with it skipUnlessGhcVersion ">= 8.1" + skipIfGhcVersion "== 9.0.2 || == 9.2.1" -- https://github.com/haskell/cabal/issues/7987 withPackageDb $ do let setup_install' args = setup_install_with_docs (["--cabal-file", "Includes2.cabal"] ++ args) setup_install' ["mylib", "--cid", "mylib-0.1.0.0"] diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs index 82cb49643a3..3c2efc9b16d 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs @@ -3,6 +3,7 @@ import Data.List import qualified Data.Char as Char main = setupAndCabalTest $ do skipUnlessGhcVersion ">= 8.1" + skipIfGhcVersion "== 9.0.2 || == 9.2.1" -- https://github.com/haskell/cabal/issues/7987 withPackageDb $ do containers_id <- getIPID "containers" withDirectory "repo/sigs-0.1.0.0" $ setup_install_with_docs ["--ipid", "sigs-0.1.0.0"] diff --git a/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs b/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs index 7b7bae851bf..b4e194f7f69 100644 --- a/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs +++ b/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs @@ -26,6 +26,12 @@ import Test.Cabal.Prelude main = setupAndCabalTest . recordMode DoNotRecord $ do -- Foreign libraries don't work with GHC 7.6 and earlier skipUnlessGhcVersion ">= 7.8" + skipIf "macOS, ghc 8.10.7 (#7989)" =<< do + -- https://github.com/haskell/cabal/issues/7989 + osx <- isOSX + ghc <- isGhcVersion "== 8.0.2" + return $ osx && ghc + withPackageDb $ do setup_install [] setup "copy" [] -- regression test #4156 diff --git a/cabal-testsuite/PackageTests/Regression/T4025/setup.test.hs b/cabal-testsuite/PackageTests/Regression/T4025/setup.test.hs index 9f38351758f..fb22202f83a 100644 --- a/cabal-testsuite/PackageTests/Regression/T4025/setup.test.hs +++ b/cabal-testsuite/PackageTests/Regression/T4025/setup.test.hs @@ -4,6 +4,12 @@ import Test.Cabal.Prelude -- support RPATH. main = setupAndCabalTest $ do skipIfWindows + skipIf "macOS, ghc 8.10.7 (#7610, #7988)" =<< do + -- https://github.com/haskell/cabal/issues/7610 + -- https://github.com/haskell/cabal/issues/7988 + osx <- isOSX + ghc <- isGhcVersion "== 8.10.7 || == 9.0.1" + return $ osx && ghc setup "configure" ["--enable-executable-dynamic"] setup "build" [] -- This should fail as it we should NOT be able to find the