From 3486b4addcec20f881a85d99aa37c2701c108c08 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Sat, 26 Jan 2019 15:24:28 +0100 Subject: ghc-session: Run V2 tests first to get faster build times We cache the produced helper exe without regard to which proj-type produced it, so this way we avoid building the helper exe (and it's dependencies) with cabal v1-build which doesn't cache across CI builds. --- tests/GhcSession.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs index 0a62d2e..38ff7c8 100644 --- a/tests/GhcSession.hs +++ b/tests/GhcSession.hs @@ -66,8 +66,8 @@ main = do let proj_impls :: [(ProjType, ProjSetup0)] proj_impls = - [ (V1, oldBuildProjSetup) - , (V2, newBuildProjSetup) + [ (V2, newBuildProjSetup) + , (V1, oldBuildProjSetup) , (Stack, stackProjSetup g_ver) ] @@ -83,7 +83,7 @@ main = do [ TC (TN "exelib") (parseVer "1.10") (parseVer "0") [] , TC (TN "exeintlib") (parseVer "2.0") (parseVer "0") [] , TC (TN "fliblib") (parseVer "2.0") (parseVer "0") [] - , TC (TN "bkpregex") (parseVer "2.0") (parseVer "8.1") [V1, V2] + , TC (TN "bkpregex") (parseVer "2.0") (parseVer "8.1") [V2, V1] , let multipkg_loc = TF "tests/multipkg/" "proj/" "proj/proj.cabal" in TC multipkg_loc (parseVer "1.10") (parseVer "0") [V2, Stack] -- min Cabal lib ver -^ min GHC ver -^ -- cgit v1.2.3