From e391702862c1d201155369b4e54a49cbe6f8fb24 Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Sun, 28 Apr 2024 02:26:19 +0000 Subject: [PATCH] GHC 9.10 compat in tests: disable tests regressing due to #9940 --- cabal-install/tests/IntegrationTests2.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cabal-install/tests/IntegrationTests2.hs b/cabal-install/tests/IntegrationTests2.hs index 6579b2ddcc2..ce7e6ba8759 100644 --- a/cabal-install/tests/IntegrationTests2.hs +++ b/cabal-install/tests/IntegrationTests2.hs @@ -1436,9 +1436,11 @@ testSetupScriptStyles config reportSubCase = do let isOSX (Platform _ OSX) = True isOSX _ = False + compilerVer = compilerVersion (pkgConfigCompiler sharedConfig) -- Skip the Custom tests when the shipped Cabal library is buggy unless (isOSX (pkgConfigPlatform sharedConfig) - && compilerVersion (pkgConfigCompiler sharedConfig) < mkVersion [7,10]) $ do + && ((compilerVer < mkVersion [7,10]) + || (compilerVer >= mkVersion [9,10] && compilerVer < mkVersion [9.11]))) $ do (plan1, res1) <- executePlan plan0 pkg1 <- expectPackageInstalled plan1 res1 pkgidA