summaryrefslogtreecommitdiff
path: root/testsuite/mk/test.mk
diff options
context:
space:
mode:
authorKrzysztof Gogolewski <krz.gogolewski@gmail.com>2018-08-12 10:09:41 +0200
committerKrzysztof Gogolewski <krz.gogolewski@gmail.com>2018-08-12 10:09:42 +0200
commit97596a44cafefba6b03f1dca8f445078dae12ba7 (patch)
tree7d227d524652026085706a7b8565256ee9e50da3 /testsuite/mk/test.mk
parentf27d7145414eae17a211b88908965c91b0236a0f (diff)
downloadhaskell-97596a44cafefba6b03f1dca8f445078dae12ba7.tar.gz
Simplify testsuite driver, part 2
Summary: - Avoid import *; this helps tools such as pyflakes. The last occurrence in runtests.py is not easy to remove as it's used by .T files. - Use False/True instead of 0/1. Test Plan: validate Reviewers: bgamari, thomie, simonmar Reviewed By: thomie Subscribers: rwbarton, carter Differential Revision: https://phabricator.haskell.org/D5062
Diffstat (limited to 'testsuite/mk/test.mk')
-rw-r--r--testsuite/mk/test.mk24
1 files changed, 12 insertions, 12 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index 87d22b330b..3e9f4d6113 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -81,9 +81,9 @@ RUNTEST_OPTS += -e "ghc_compiler_always_flags='$(TEST_HC_OPTS)'"
RUNTEST_OPTS += -e config.compiler_debugged=$(GhcDebugged)
ifeq "$(GhcWithNativeCodeGen)" "YES"
-RUNTEST_OPTS += -e ghc_with_native_codegen=1
+RUNTEST_OPTS += -e ghc_with_native_codegen=True
else
-RUNTEST_OPTS += -e ghc_with_native_codegen=0
+RUNTEST_OPTS += -e ghc_with_native_codegen=False
endif
GHC_PRIM_LIBDIR := $(subst library-dirs: ,,$(shell "$(GHC_PKG)" field ghc-prim library-dirs --simple-output))
@@ -112,15 +112,15 @@ RUNTEST_OPTS += -e config.have_profiling=False
endif
ifeq "$(filter thr, $(GhcRTSWays))" "thr"
-RUNTEST_OPTS += -e ghc_with_threaded_rts=1
+RUNTEST_OPTS += -e ghc_with_threaded_rts=True
else
-RUNTEST_OPTS += -e ghc_with_threaded_rts=0
+RUNTEST_OPTS += -e ghc_with_threaded_rts=False
endif
ifeq "$(filter dyn, $(GhcRTSWays))" "dyn"
-RUNTEST_OPTS += -e ghc_with_dynamic_rts=1
+RUNTEST_OPTS += -e ghc_with_dynamic_rts=True
else
-RUNTEST_OPTS += -e ghc_with_dynamic_rts=0
+RUNTEST_OPTS += -e ghc_with_dynamic_rts=False
endif
ifeq "$(GhcWithInterpreter)" "NO"
@@ -166,20 +166,20 @@ CABAL_PLUGIN_BUILD = --enable-library-vanilla --disable-shared
endif
ifeq "$(GhcWithSMP)" "YES"
-RUNTEST_OPTS += -e ghc_with_smp=1
+RUNTEST_OPTS += -e ghc_with_smp=True
else
-RUNTEST_OPTS += -e ghc_with_smp=0
+RUNTEST_OPTS += -e ghc_with_smp=False
endif
ifeq "$(LLC)" ""
-RUNTEST_OPTS += -e ghc_with_llvm=0
+RUNTEST_OPTS += -e ghc_with_llvm=False
else ifeq "$(TargetARCH_CPP)" "powerpc"
-RUNTEST_OPTS += -e ghc_with_llvm=0
+RUNTEST_OPTS += -e ghc_with_llvm=False
else ifneq "$(LLC)" "llc"
# If we have a real detected value for LLVM, then it really ought to work
-RUNTEST_OPTS += -e ghc_with_llvm=1
+RUNTEST_OPTS += -e ghc_with_llvm=True
else
-RUNTEST_OPTS += -e ghc_with_llvm=0
+RUNTEST_OPTS += -e ghc_with_llvm=False
endif
ifeq "$(WINDOWS)" "YES"