From 04c2d34f1874bc198288d33c784bc26f89280ee2 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Sat, 11 Jan 2020 07:46:33 +0100 Subject: Fix Cabal version selection for Stack (esp. build-type:Custom) Previously we would pick up Stack's Cabal version with ghc-pkg on the global package-db. This however ignores that Stack also supports custom Setup.hs with the Cabal version from the snapshot instead. --- tests/CompileTest.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/CompileTest.hs') diff --git a/tests/CompileTest.hs b/tests/CompileTest.hs index 77698c5..88ba44e 100644 --- a/tests/CompileTest.hs +++ b/tests/CompileTest.hs @@ -152,11 +152,11 @@ testCabalVersions versions = do mcabalVersions <- runMaybeT $ listCabalVersions (Just db) case mcabalVersions of Just [hdver] -> - return $ che0 (CabalVersion hdver) (Just db) + return $ che0 (CabalVersion hdver) [db] _ -> - return $ che0 (CabalHEAD ()) Nothing + return $ che0 (CabalHEAD ()) [] (CabalVersion ver) -> - return $ che0 (CabalVersion ver) Nothing + return $ che0 (CabalVersion ver) [] compileHelper che -- cgit v1.2.3