Skip to content

Commit fede274

Browse files
committed
GHC 9.10 compat in tests: disable tests regressing due to #9940
1 parent 0f9d410 commit fede274

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cabal-install/tests/IntegrationTests2.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,9 +1436,11 @@ testSetupScriptStyles config reportSubCase = do
14361436

14371437
let isOSX (Platform _ OSX) = True
14381438
isOSX _ = False
1439+
compilerVer = compilerVersion (pkgConfigCompiler sharedConfig)
14391440
-- Skip the Custom tests when the shipped Cabal library is buggy
1440-
unless (isOSX (pkgConfigPlatform sharedConfig)
1441-
&& compilerVersion (pkgConfigCompiler sharedConfig) < mkVersion [7,10]) $ do
1441+
unless ((isOSX (pkgConfigPlatform sharedConfig) && (compilerVer < mkVersion [7,10]))
1442+
-- 9.10 ships Cabal 3.12.0.0 affected by #9940
1443+
|| (mkVersion [9,10] <= compilerVer && compilerVer < mkVersion [9,11])) $ do
14421444

14431445
(plan1, res1) <- executePlan plan0
14441446
pkg1 <- expectPackageInstalled plan1 res1 pkgidA

0 commit comments

Comments
 (0)