Commit a4ce26e0 authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Marge Bot

hadrian: Make runtest invocation consistency with Make

Use True/False instead of 0/1. This shouldn't be a functional change but
we should be consistent.
parent c9236384
Pipeline #12066 passed with stages
in 432 minutes and 28 seconds
......@@ -94,7 +94,8 @@ runTestBuilderArgs = builder RunTest ? do
-- See #16087
let ghcBuiltByLlvm = False -- TODO: Implement this check
let asZeroOne s b = s ++ zeroOne b
let asBool :: String -> Bool -> String
asBool s b = s ++ show b
-- TODO: set CABAL_MINIMAL_BUILD/CABAL_PLUGIN_BUILD
mconcat [ arg $ "testsuite/driver/runtests.py"
......@@ -109,18 +110,18 @@ runTestBuilderArgs = builder RunTest ? do
, arg "-e", arg $ "config.exeext=" ++ quote exe
, arg "-e", arg $ "config.compiler_debugged=" ++
show debugged
, arg "-e", arg $ asZeroOne "ghc_with_native_codegen=" withNativeCodeGen
, arg "-e", arg $ asBool "ghc_with_native_codegen=" withNativeCodeGen
, arg "-e", arg $ "config.have_interp=" ++ show withInterpreter
, arg "-e", arg $ "config.unregisterised=" ++ show unregisterised
, arg "-e", arg $ "ghc_compiler_always_flags=" ++ quote ghcFlags
, arg "-e", arg $ asZeroOne "ghc_with_dynamic_rts=" (hasRtsWay "dyn")
, arg "-e", arg $ asZeroOne "ghc_with_threaded_rts=" (hasRtsWay "thr")
, arg "-e", arg $ asZeroOne "config.have_vanilla=" (hasLibWay vanilla)
, arg "-e", arg $ asZeroOne "config.have_dynamic=" (hasLibWay dynamic)
, arg "-e", arg $ asZeroOne "config.have_profiling=" (hasLibWay profiling)
, arg "-e", arg $ asZeroOne "ghc_with_smp=" withSMP
, arg "-e", arg $ asBool "ghc_with_dynamic_rts=" (hasRtsWay "dyn")
, arg "-e", arg $ asBool "ghc_with_threaded_rts=" (hasRtsWay "thr")
, arg "-e", arg $ asBool "config.have_vanilla=" (hasLibWay vanilla)
, arg "-e", arg $ asBool "config.have_dynamic=" (hasLibWay dynamic)
, arg "-e", arg $ asBool "config.have_profiling=" (hasLibWay profiling)
, arg "-e", arg $ asBool "ghc_with_smp=" withSMP
, arg "-e", arg $ "ghc_with_llvm=0" -- TODO: support LLVM
, arg "-e", arg $ "config.ghc_dynamic_by_default=" ++ show hasDynamicByDefault
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment