aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2020-01-11 07:46:33 +0100
committerDaniel Gröber <dxld@darkboxed.org>2020-01-11 07:51:18 +0100
commit04c2d34f1874bc198288d33c784bc26f89280ee2 (patch)
tree4ff59ed45a13022a3b2c5abc921740391302a414 /tests
parent1c0f2e8c403126acecfd6d6cccf2ad0b20f38929 (diff)
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/CompileTest.hs6
1 files changed, 3 insertions, 3 deletions
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