diff options
| author | Peter Trommler <ptrommler@acm.org> | 2019-11-03 13:54:41 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-05 02:46:48 -0500 |
| commit | 487ede425bd0ef958481f0ca0b9614d362e10972 (patch) | |
| tree | 816f7bc6878726fa6be1e88d802a00c45b0f8ad9 /testsuite/tests/rts | |
| parent | d57059f72ed9a34f0589beac4feb41f8738dfdea (diff) | |
| download | haskell-487ede425bd0ef958481f0ca0b9614d362e10972.tar.gz | |
testsuite: skip test requiring RTS linker on PowerPC
The RTS linker is not available on 64-bit PowerPC. Instead of
marking tests that require the RTS linker as broken on PowerPC
64-bit skip the respective tests on all platforms where the
RTS linker or a statically linked external interpreter is not
available.
Fixes #11259
Diffstat (limited to 'testsuite/tests/rts')
| -rw-r--r-- | testsuite/tests/rts/linker/all.T | 11 | ||||
| -rw-r--r-- | testsuite/tests/rts/linker/unload_multiple_objs/all.T | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/testsuite/tests/rts/linker/all.T b/testsuite/tests/rts/linker/all.T index f57edc4eef..2f1bb2bb61 100644 --- a/testsuite/tests/rts/linker/all.T +++ b/testsuite/tests/rts/linker/all.T @@ -57,19 +57,16 @@ def checkDynAsm(actual_file, normaliser): # These should have extra_clean() arguments, but I need # to somehow extract out the name of DLLs to do that test('T5435_v_asm_a', [extra_files(['T5435.hs', 'T5435_asm.c']), - when(arch('powerpc64') or arch('powerpc64le'), - expect_broken(11259))], + unless(config.have_RTS_linker, skip)], makefile_test, ['T5435_v_asm_a']) # this one just needs to run on linux, as darwin/mingw32 are covered # by the _a test already. test('T5435_v_asm_b', [extra_files(['T5435.hs', 'T5435_asm.c']), - when(arch('powerpc64') or arch('powerpc64le'), - expect_broken(11259)), + unless(config.have_RTS_linker, skip), when(opsys('darwin') or opsys('mingw32'), skip)], makefile_test, ['T5435_v_asm_b']) test('T5435_v_gcc', [extra_files(['T5435.hs', 'T5435_gcc.c']), - when(arch('powerpc64') or arch('powerpc64le'), - expect_broken(11259))], + unless(config.have_RTS_linker, skip)], makefile_test, ['T5435_v_gcc']) test('T5435_dyn_asm', [extra_files(['T5435.hs', 'T5435_asm.c']), check_stdout(checkDynAsm)], @@ -79,7 +76,7 @@ test('T5435_dyn_gcc', extra_files(['T5435.hs', 'T5435_gcc.c']) , makefile_test, ###################################### test('linker_unload', [extra_files(['LinkerUnload.hs', 'Test.hs']), - when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))], + unless(config.have_RTS_linker, skip)], makefile_test, ['linker_unload']) ###################################### diff --git a/testsuite/tests/rts/linker/unload_multiple_objs/all.T b/testsuite/tests/rts/linker/unload_multiple_objs/all.T index e7b1e2fb76..378177cf41 100644 --- a/testsuite/tests/rts/linker/unload_multiple_objs/all.T +++ b/testsuite/tests/rts/linker/unload_multiple_objs/all.T @@ -1,4 +1,4 @@ test('linker_unload_multiple_objs', [extra_files(['../LinkerUnload.hs', 'A.hs', 'B.hs', 'C.hs', 'D.hs',]), - when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))], + unless(config.have_RTS_linker, skip)], run_command, ['$MAKE -s --no-print-directory linker_unload_multiple_objs']) |