From 5f361e1e0b81bca985204c50fefa2a3973ac3c47 Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Sat, 5 Aug 2023 13:47:51 +0800 Subject: [PATCH] Fix compile test --- test/optparse-test/CompileTest.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/optparse-test/CompileTest.hs b/test/optparse-test/CompileTest.hs index 907e25c..9979a9e 100644 --- a/test/optparse-test/CompileTest.hs +++ b/test/optparse-test/CompileTest.hs @@ -35,7 +35,7 @@ mkDefaultGHCCompileOptions target boot = False Nothing Nothing - False + Nothing Nothing mkDefaultHLSCompileOptions :: HLSVer -> [ToolVersion] -> HLSCompileOptions @@ -89,7 +89,8 @@ compileGhcCheckList = mapSecond CompileGHC , (baseCmd <> "--overwrite-version 9.4.5-p1", baseOptions{GHC.ovewrwiteVer = Just $ mkVersion' "9.4.5-p1"}) , (baseCmd <> "-f make", baseOptions{GHC.buildFlavour = Just "make"}) , (baseCmd <> "--flavour make", baseOptions{GHC.buildFlavour = Just "make"}) - , (baseCmd <> "--hadrian", baseOptions{GHC.hadrian = True}) + , (baseCmd <> "--hadrian", baseOptions{GHC.buildSystem = Just Hadrian}) + , (baseCmd <> "--make", baseOptions{GHC.buildSystem = Just Make}) , (baseCmd <> "-i /tmp/out_dir", baseOptions{GHC.isolateDir = Just "/tmp/out_dir"}) , (baseCmd <> "--isolate /tmp/out_dir", baseOptions{GHC.isolateDir = Just "/tmp/out_dir"}) ]