Commit 5499f12f authored by Ben Gamari's avatar Ben Gamari 🐢

testsuite: Mark th tests as broken in ext-interp way in LLVM build flavours

This is due to the failures documented in #16087. The condition here could be
improved as it matches on `BUILD_FLAVOUR` instead of looking at the compiler
flags. However, it's better than nothing and I hope we will be able to fix these
issues before long.
parent bd8a6bde
...@@ -83,6 +83,9 @@ runTestBuilderArgs = builder RunTest ? do ...@@ -83,6 +83,9 @@ runTestBuilderArgs = builder RunTest ? do
timeoutProg <- expr buildRoot <&> (-/- timeoutPath) timeoutProg <- expr buildRoot <&> (-/- timeoutPath)
integerLib <- expr (integerLibrary flav) integerLib <- expr (integerLibrary flav)
-- See #16087
let ghcBuiltByLlvm = False -- TODO: Implement this check
let asZeroOne s b = s ++ zeroOne b let asZeroOne s b = s ++ zeroOne b
-- TODO: set CABAL_MINIMAL_BUILD/CABAL_PLUGIN_BUILD -- TODO: set CABAL_MINIMAL_BUILD/CABAL_PLUGIN_BUILD
...@@ -112,6 +115,7 @@ runTestBuilderArgs = builder RunTest ? do ...@@ -112,6 +115,7 @@ runTestBuilderArgs = builder RunTest ? do
, arg "-e", arg $ "config.ghc_dynamic_by_default=" ++ show hasDynamicByDefault , arg "-e", arg $ "config.ghc_dynamic_by_default=" ++ show hasDynamicByDefault
, arg "-e", arg $ "config.ghc_dynamic=" ++ show hasDynamic , arg "-e", arg $ "config.ghc_dynamic=" ++ show hasDynamic
, arg "-e", arg $ "config.integer_backend=" ++ show (pkgName integerLib) , arg "-e", arg $ "config.integer_backend=" ++ show (pkgName integerLib)
, arg "-e", arg $ "config.ghc_built_by_llvm=" ++ show ghcBuiltByLlvm
-- Use default value, see: -- Use default value, see:
-- https://github.com/ghc/ghc/blob/master/testsuite/mk/boilerplate.mk -- https://github.com/ghc/ghc/blob/master/testsuite/mk/boilerplate.mk
......
...@@ -240,6 +240,13 @@ else ...@@ -240,6 +240,13 @@ else
RUNTEST_OPTS += -e config.local=True RUNTEST_OPTS += -e config.local=True
endif 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 += -e 'config.integer_backend="$(INTEGER_LIBRARY)"' RUNTEST_OPTS += -e 'config.integer_backend="$(INTEGER_LIBRARY)"'
RUNTEST_OPTS += \ RUNTEST_OPTS += \
......
...@@ -12,6 +12,8 @@ setTestOpts(req_interp) ...@@ -12,6 +12,8 @@ setTestOpts(req_interp)
if config.have_ext_interp : if config.have_ext_interp :
setTestOpts(extra_ways(['ext-interp'])) setTestOpts(extra_ways(['ext-interp']))
setTestOpts(only_ways(['normal','ghci','ext-interp'])) setTestOpts(only_ways(['normal','ghci','ext-interp']))
if config.ghc_built_by_llvm:
setTestOpts(expect_broken_for(16087, ['ext-interp']))
test('TH_mkName', normal, compile, ['-v0']) test('TH_mkName', normal, compile, ['-v0'])
test('TH_overloadedlabels', normal, compile, ['-v0']) test('TH_overloadedlabels', normal, compile, ['-v0'])
......
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