diff options
| author | Alp Mestanogullari <alpmestan@gmail.com> | 2019-04-17 15:03:06 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-18 22:46:12 -0400 |
| commit | 5988f17a799ba3416bb6ed539ae65e1f3fd9f2c0 (patch) | |
| tree | 37067c4f490d79d25d4287285cd8eff4ac3ea114 /hadrian | |
| parent | 4c8a67a4b025774993b80442fb3654c8868c1d24 (diff) | |
| download | haskell-5988f17a799ba3416bb6ed539ae65e1f3fd9f2c0.tar.gz | |
Hadrian: fix the value we pass to the test driver for config.compiler_debugged
We used to pass YES/NO, while that particular field is set to True/False. This
happens to fix an unexpected pass, T9208.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index acf624c103..932b497b0f 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -68,7 +68,7 @@ runTestBuilderArgs = builder RunTest ? do withInterpreter <- getBooleanSetting TestGhcWithInterpreter unregisterised <- getBooleanSetting TestGhcUnregisterised withSMP <- getBooleanSetting TestGhcWithSMP - debugged <- read <$> getTestSetting TestGhcDebugged + debugged <- readBool <$> getTestSetting TestGhcDebugged keepFiles <- expr (testKeepFiles <$> userSetting defaultTestArgs) accept <- expr (testAccept <$> userSetting defaultTestArgs) @@ -104,8 +104,8 @@ runTestBuilderArgs = builder RunTest ? do , arg "-e", arg $ "config.accept_platform=" ++ show acceptPlatform , arg "-e", arg $ "config.accept_os=" ++ show acceptOS , arg "-e", arg $ "config.exeext=" ++ quote exe - , arg "-e", arg $ "config.compiler_debugged=" ++ quote (yesNo debugged) - , arg "-e", arg $ "ghc_debugged=" ++ quote (yesNo debugged) + , arg "-e", arg $ "config.compiler_debugged=" ++ + show debugged , arg "-e", arg $ asZeroOne "ghc_with_native_codegen=" withNativeCodeGen , arg "-e", arg $ "config.have_interp=" ++ show withInterpreter @@ -136,6 +136,8 @@ runTestBuilderArgs = builder RunTest ? do , getTestArgs -- User-provided arguments from command line. ] + where readBool x = read x :: Bool + -- | Command line arguments for running GHC's test script. getTestArgs :: Args getTestArgs = do |