[Git][ghc/ghc][master] Hadrian: fix the value we pass to the test driver for config.compiler_debugged

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
5988f17a by Alp Mestanogullari at 2019-04-19T02:46:12Z
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.

- - - - -


1 changed file:

- hadrian/src/Settings/Builders/RunTest.hs


Changes:

=====================================
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



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/5988f17a799ba3416bb6ed539ae65e1f3fd9f2c0

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/5988f17a799ba3416bb6ed539ae65e1f3fd9f2c0
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190418/0b516439/attachment-0001.html>