From d238d3062a9858fef667c6fbf80605b8209a937f Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 5 Jul 2019 11:31:32 -0400
Subject: [PATCH] Fix formatting of --info's "Debug on" field
As noted in #16914, the value `True` was used instead of `YES` here, in
contrast to the other boolean fields emitted by `--info`. This confused
the testsuite driver and broke the `ghc_debugged` testsuite predicate.
---
compiler/main/DynFlags.hs | 2 +-
hadrian/src/Settings/Builders/RunTest.hs | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 1f7de170a9e6..448e914ce636 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -5693,7 +5693,7 @@ compilerInfo dflags
("GHC Dynamic", showBool dynamicGhc),
-- Whether or not GHC was compiled using -prof
("GHC Profiled", showBool rtsIsProfiled),
- ("Debug on", show debugIsOn),
+ ("Debug on", showBool debugIsOn),
("LibDir", topDir dflags),
-- The path of the global package database used by GHC
("Global Package DB", systemPackageConfig dflags)
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs
index ff35d9573780..4b4d815a2c55 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 <- readBool <$> getTestSetting TestGhcDebugged
+ debugged <- getBooleanSetting TestGhcDebugged
keepFiles <- expr (testKeepFiles <$> userSetting defaultTestArgs)
accept <- expr (testAccept <$> userSetting defaultTestArgs)
@@ -140,8 +140,6 @@ 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
--
GitLab