diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-12-09 15:32:58 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-17 07:24:40 -0500 |
| commit | 6ea4eb4babf090e447277a3e4b0dea31d79e9acf (patch) | |
| tree | 06d4a2e8e137ae55bca7f86c8c01ca22eb628f36 /testsuite/mk | |
| parent | 7cef0b7d707c0b242ee788919f76a73d1a3d2c96 (diff) | |
| download | haskell-6ea4eb4babf090e447277a3e4b0dea31d79e9acf.tar.gz | |
testsuite: Make ghc_built_by_llvm check more precise
Previously it would hackily look at the flavour name to determine
whether LLVM was used to build stage2 ghc. However, this didn't work at
all with Hadrian and would miss cases like ARM where we use the LLVM
backend by default.
See #16087 for the motivation for why ghc_built_by_llvm is needed at
all. This should catch one of the ARMv7 failures described in #17555.
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index be6b741751..6e6def19ab 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -178,6 +178,7 @@ else RUNTEST_OPTS += -e ghc_with_smp=False endif +# Does the LLVM backend work? ifeq "$(LLC)" "" RUNTEST_OPTS += -e ghc_with_llvm=False else ifeq "$(TargetARCH_CPP)" "powerpc" @@ -244,13 +245,6 @@ else RUNTEST_OPTS += -e config.local=True endif -# Some tests in ext-interp fail when ghc-stage2 is built using LLVM. See #16087 -ifeq "$(findstring llvm,$(BUILD_FLAVOUR))" "" -RUNTEST_OPTS += -e config.ghc_built_by_llvm=False -else -RUNTEST_OPTS += -e config.ghc_built_by_llvm=True -endif - RUNTEST_OPTS += \ --rootdir=. \ --config-file=$(CONFIG) \ |