diff options
| author | Stefan Schulze Frielinghaus <stefansf@linux.ibm.com> | 2019-10-30 16:42:30 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-08 05:36:54 -0500 |
| commit | 9db2e905f974f6b6dae74cb5157c497e056d24f2 (patch) | |
| tree | b23a00b956b06fa6dd84d205d6c0a2c48b041396 /testsuite/tests/rts | |
| parent | a3ce52fd5704247de2360f0e8423834113fe3a71 (diff) | |
| download | haskell-9db2e905f974f6b6dae74cb5157c497e056d24f2.tar.gz | |
Testsuite: Introduce req_rts_linker
Some tests depend on the RTS linker. Introduce a modifier to skip such
tests, in case the RTS linker is not available.
Diffstat (limited to 'testsuite/tests/rts')
| -rw-r--r-- | testsuite/tests/rts/all.T | 1 | ||||
| -rw-r--r-- | testsuite/tests/rts/linker/all.T | 14 | ||||
| -rw-r--r-- | testsuite/tests/rts/linker/unload_multiple_objs/all.T | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 36f63c571e..33853dc3d2 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -395,6 +395,7 @@ test('keep-cafs', when(opsys('mingw32'), expect_broken (5987)), when(platform('powerpc64le-unknown-linux'), expect_broken(11261)), when(opsys('freebsd'), expect_broken(16035)), + req_rts_linker ], makefile_test, ['KeepCafs']) diff --git a/testsuite/tests/rts/linker/all.T b/testsuite/tests/rts/linker/all.T index 2f1bb2bb61..d2bb5891fd 100644 --- a/testsuite/tests/rts/linker/all.T +++ b/testsuite/tests/rts/linker/all.T @@ -56,17 +56,14 @@ def checkDynAsm(actual_file, normaliser): # separately now. # 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']), - unless(config.have_RTS_linker, skip)], +test('T5435_v_asm_a', [extra_files(['T5435.hs', 'T5435_asm.c']), req_rts_linker], 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']), - unless(config.have_RTS_linker, skip), - when(opsys('darwin') or opsys('mingw32'), skip)], +test('T5435_v_asm_b', [extra_files(['T5435.hs', 'T5435_asm.c']), req_rts_linker, + when(opsys('darwin') or opsys('mingw32'), skip)], makefile_test, ['T5435_v_asm_b']) -test('T5435_v_gcc', [extra_files(['T5435.hs', 'T5435_gcc.c']), - unless(config.have_RTS_linker, skip)], +test('T5435_v_gcc', [extra_files(['T5435.hs', 'T5435_gcc.c']), req_rts_linker], makefile_test, ['T5435_v_gcc']) test('T5435_dyn_asm', [extra_files(['T5435.hs', 'T5435_asm.c']), check_stdout(checkDynAsm)], @@ -75,8 +72,7 @@ test('T5435_dyn_gcc', extra_files(['T5435.hs', 'T5435_gcc.c']) , makefile_test, ###################################### test('linker_unload', - [extra_files(['LinkerUnload.hs', 'Test.hs']), - unless(config.have_RTS_linker, skip)], + [extra_files(['LinkerUnload.hs', 'Test.hs']), req_rts_linker], 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 378177cf41..52f35b4e26 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',]), - unless(config.have_RTS_linker, skip)], + req_rts_linker], run_command, ['$MAKE -s --no-print-directory linker_unload_multiple_objs']) |