diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-07-05 22:24:08 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-07-05 22:24:08 -0400 |
| commit | 2b239b32cf53fccfb8240eab48ea5566daf74be6 (patch) | |
| tree | deaa589440f7dda72d000ea525f855256a4fe70a /testsuite | |
| parent | 4b559f04ab0ea6737e88717ff363d101535aedfa (diff) | |
| download | haskell-wip/runtests-refactor.tar.gz | |
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/mk/test.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index ea4fa55a67..1bec27ec95 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -79,7 +79,7 @@ else dllext = .so endif -RUNTEST_OPTS += -e "ghc_compiler_always_flags='$(TEST_HC_OPTS)'" +RUNTEST_OPTS += --extra-hc-flag "$(TEST_HC_OPTS)" ifeq "$(GhcDebugged)" "YES" RUNTEST_OPTS += -e "config.compiler_debugged=True" @@ -123,15 +123,15 @@ RUNTEST_OPTS += -e config.have_profiling=False endif ifeq "$(filter thr, $(GhcRTSWays))" "thr" -RUNTEST_OPTS += -e ghc_with_threaded_rts=True +RUNTEST_OPTS += -e config.ghc_with_threaded_rts=True else -RUNTEST_OPTS += -e ghc_with_threaded_rts=False +RUNTEST_OPTS += -e config.ghc_with_threaded_rts=False endif ifeq "$(filter dyn, $(GhcRTSWays))" "dyn" -RUNTEST_OPTS += -e ghc_with_dynamic_rts=True +RUNTEST_OPTS += -e config.ghc_with_dynamic_rts=True else -RUNTEST_OPTS += -e ghc_with_dynamic_rts=False +RUNTEST_OPTS += -e config.ghc_with_dynamic_rts=False endif ifeq "$(GhcWithInterpreter)" "NO" @@ -183,21 +183,21 @@ CABAL_PLUGIN_BUILD = --enable-library-vanilla --disable-shared endif ifeq "$(GhcWithSMP)" "YES" -RUNTEST_OPTS += -e ghc_with_smp=True +RUNTEST_OPTS += -e config.ghc_with_smp=True else -RUNTEST_OPTS += -e ghc_with_smp=False +RUNTEST_OPTS += -e config.ghc_with_smp=False endif # Does the LLVM backend work? ifeq "$(LLC)" "" -RUNTEST_OPTS += -e ghc_with_llvm=False +RUNTEST_OPTS += -e config.ghc_with_llvm=False else ifeq "$(TargetARCH_CPP)" "powerpc" -RUNTEST_OPTS += -e ghc_with_llvm=False +RUNTEST_OPTS += -e config.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=True +RUNTEST_OPTS += -e config.ghc_with_llvm=True else -RUNTEST_OPTS += -e ghc_with_llvm=False +RUNTEST_OPTS += -e config.ghc_with_llvm=False endif ifeq "$(WINDOWS)" "YES" |