diff options
| author | Peter Trommler <ptrommler@acm.org> | 2020-02-16 10:30:03 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-02-20 21:20:05 -0500 |
| commit | c8439fc789ff00cfdd453d2425d2146df69e0729 (patch) | |
| tree | 4ed0259f0fcdb536daed81f6e23675ef94e21677 /testsuite/tests/ghci | |
| parent | 70a901105044c85c756fd93899387f0215f7b1de (diff) | |
| download | haskell-c8439fc789ff00cfdd453d2425d2146df69e0729.tar.gz | |
Fix testsuite on powerpc64le
Remove expect broken on recomp tests, #11260 was closed
by !2264 and #11323 most likely by !2264 as well.
GHCi scripts tests work on GHCi but not the external interpreter,
adjust test configuration accordingly. Fixes unexpected passes.
Mark test requiring DWARF expect fail on powerpc64[le] for #11261.
Diffstat (limited to 'testsuite/tests/ghci')
| -rw-r--r-- | testsuite/tests/ghci/T16392/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/ghci/prog001/prog001.T | 4 | ||||
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/ghci/T16392/all.T b/testsuite/tests/ghci/T16392/all.T index fa16e2daa4..7be98720bd 100644 --- a/testsuite/tests/ghci/T16392/all.T +++ b/testsuite/tests/ghci/T16392/all.T @@ -1,5 +1,5 @@ test('T16392', [extra_files(['A.hs']), - extra_ways(['ghci-ext']), - req_rts_linker], + when(config.have_RTS_linker,extra_ways(['ghci-ext'])), + req_interp], ghci_script, ['T16392.script']) diff --git a/testsuite/tests/ghci/prog001/prog001.T b/testsuite/tests/ghci/prog001/prog001.T index 1765596f8f..519ee2e382 100644 --- a/testsuite/tests/ghci/prog001/prog001.T +++ b/testsuite/tests/ghci/prog001/prog001.T @@ -2,6 +2,6 @@ test('prog001', [extra_files(['../shell.hs', 'A.hs', 'B.hs', 'C1.hs', 'D1.hs', 'D2.hs']), when(arch('arm'), fragile(17555)), cmd_prefix('ghciWayFlags=' + config.ghci_way_flags), - req_rts_linker, - unless(opsys('mingw32'), extra_ways(['ghci-ext']))], + req_interp, + unless(opsys('mingw32') or not config.have_RTS_linker, extra_ways(['ghci-ext']))], ghci_script, ['prog001.script']) diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index e4c028ace1..67e442d887 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -10,12 +10,12 @@ test('ghci001', combined_output, ghci_script, ['ghci001.script']) test('ghci002', combined_output, ghci_script, ['ghci002.script']) test('ghci003', combined_output, ghci_script, ['ghci003.script']) -test('ghci004', [ combined_output, req_rts_linker, - unless(opsys('mingw32'),extra_ways(['ghci-ext'])) ], +test('ghci004', [ combined_output, + unless(opsys('mingw32') or not (config.have_RTS_linker),extra_ways(['ghci-ext'])) ], ghci_script, ['ghci004.script']) test('ghci005', combined_output, ghci_script, ['ghci005.script']) -test('ghci006', [ combined_output, req_rts_linker, - unless(opsys('mingw32'),extra_ways(['ghci-ext'])) ], +test('ghci006', [ combined_output, + unless(opsys('mingw32') or not config.have_RTS_linker,extra_ways(['ghci-ext'])) ], ghci_script, ['ghci006.script']) test('ghci007', combined_output, ghci_script, ['ghci007.script']) test('ghci008', [ combined_output, |