Fix testsuite on powerpc64lewip/testsuite-20-02

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.

7 files changed, 22 insertions, 20 deletions

diff --git a/testsuite/tests/driver/T17586/all.T b/testsuite/tests/driver/T17586/all.T
index 2ec89b4d03..3912ef34db 100644
--- a/testsuite/tests/driver/T17586/all.T
+++ b/testsuite/tests/driver/T17586/all.T
@@ -1 +1,3 @@
-test('T17586', normal, makefile_test, [])
+test('T17586',
+     [when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11261))],
+     makefile_test, [])
diff --git a/testsuite/tests/driver/recomp011/all.T b/testsuite/tests/driver/recomp011/all.T
index 88144ae5f6..00a8e74608 100644
--- a/testsuite/tests/driver/recomp011/all.T
+++ b/testsuite/tests/driver/recomp011/all.T
@@ -2,5 +2,5 @@
 
 test('recomp011',
      [extra_files(['Main.hs']),
-      when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11260))],
+      when(arch('powerpc64'), expect_broken(11260))],
      makefile_test, [])
diff --git a/testsuite/tests/driver/recomp015/all.T b/testsuite/tests/driver/recomp015/all.T
index 5b77fe0f3a..25708b47d0 100644
--- a/testsuite/tests/driver/recomp015/all.T
+++ b/testsuite/tests/driver/recomp015/all.T
@@ -5,6 +5,6 @@ test('recomp015',
        # See ticket:11022#comment:7
        unless(opsys('linux') or opsys('solaris2') or opsys('openbsd'), skip),
        when(arch('arm'), skip),
-       when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11323))],
+       when(arch('powerpc64'), expect_broken(11323))],
      makefile_test, [])
 
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 28c12e151b..eb7bcb379f 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,
diff --git a/testsuite/tests/printer/all.T b/testsuite/tests/printer/all.T
index 83bfd234fc..d476927406 100644
--- a/testsuite/tests/printer/all.T
+++ b/testsuite/tests/printer/all.T
@@ -24,7 +24,7 @@ test('Ppr023', ignore_stderr, makefile_test, ['ppr023'])
 test('Ppr024', ignore_stderr, makefile_test, ['ppr024'])
 test('Ppr025', ignore_stderr, makefile_test, ['ppr025'])
 test('Ppr026', ignore_stderr, makefile_test, ['ppr026'])
-test('Ppr027', [ignore_stderr, req_rts_linker], makefile_test, ['ppr027'])
+test('Ppr027', [ignore_stderr, req_interp], makefile_test, ['ppr027'])
 test('Ppr028', ignore_stderr, makefile_test, ['ppr028'])
 test('Ppr029', ignore_stderr, makefile_test, ['ppr029'])
 test('Ppr030', ignore_stderr, makefile_test, ['ppr030'])
@@ -37,22 +37,22 @@ test('Ppr036', ignore_stderr, makefile_test, ['ppr036'])
 test('Ppr037', ignore_stderr, makefile_test, ['ppr037'])
 test('Ppr038', ignore_stderr, makefile_test, ['ppr038'])
 test('Ppr039', ignore_stderr, makefile_test, ['ppr039'])
-test('Ppr040', [ignore_stderr, req_rts_linker], makefile_test, ['ppr040'])
+test('Ppr040', [ignore_stderr, req_interp], makefile_test, ['ppr040'])
 test('Ppr041', ignore_stderr, makefile_test, ['ppr041'])
 test('Ppr042', ignore_stderr, makefile_test, ['ppr042'])
-test('Ppr043', [ignore_stderr, req_rts_linker], makefile_test, ['ppr043'])
+test('Ppr043', [ignore_stderr, req_interp], makefile_test, ['ppr043'])
 test('Ppr044', ignore_stderr, makefile_test, ['ppr044'])
 test('Ppr045', ignore_stderr, makefile_test, ['ppr045'])
 test('Ppr046', ignore_stderr, makefile_test, ['ppr046'])
 test('Ppr047', ignore_stderr, makefile_test, ['ppr047'])
 test('Ppr048', ignore_stderr, makefile_test, ['ppr048'])
-test('T13199', [ignore_stderr, req_rts_linker], makefile_test, ['T13199'])
+test('T13199', [ignore_stderr, req_interp], makefile_test, ['T13199'])
 test('T13050p', ignore_stderr, makefile_test, ['T13050p'])
-test('T13550', [ignore_stderr, req_rts_linker], makefile_test, ['T13550'])
-test('T13942', [ignore_stderr, req_rts_linker], makefile_test, ['T13942'])
-test('T14289', [ignore_stderr, req_rts_linker], makefile_test, ['T14289'])
-test('T14289b', [ignore_stderr, req_rts_linker], makefile_test, ['T14289b'])
-test('T14289c', [ignore_stderr, req_rts_linker], makefile_test, ['T14289c'])
+test('T13550', [ignore_stderr, req_interp], makefile_test, ['T13550'])
+test('T13942', [ignore_stderr, req_interp], makefile_test, ['T13942'])
+test('T14289', [ignore_stderr, req_interp], makefile_test, ['T14289'])
+test('T14289b', [ignore_stderr, req_interp], makefile_test, ['T14289b'])
+test('T14289c', [ignore_stderr, req_interp], makefile_test, ['T14289c'])
 test('T14306', ignore_stderr, makefile_test, ['T14306'])
 test('T14343', normal, compile_fail, [''])
 test('T14343b', normal, compile_fail, [''])