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

5 files changed, 6 insertions, 11 deletions

diff --git a/testsuite/tests/ghci/T16392/all.T b/testsuite/tests/ghci/T16392/all.T
index a77e0fd994..7b9bd4bf6b 100644
--- a/testsuite/tests/ghci/T16392/all.T
+++ b/testsuite/tests/ghci/T16392/all.T
@@ -1,4 +1,4 @@
 test('T16392',
      [extra_files(['A.hs']),
-      extra_ways(['ghci-ext'])],
+      when(config.have_ext_interp, extra_ways(['ghci-ext']))],
      ghci_script, ['T16392.script'])
diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T
index 88ada22332..a049df3b34 100644
--- a/testsuite/tests/ghci/linking/all.T
+++ b/testsuite/tests/ghci/linking/all.T
@@ -15,7 +15,7 @@ test('ghcilink003', [unless(doing_ghci, skip)], makefile_test, ['ghcilink003'])
 test('ghcilink004',
      [extra_files(['TestLink.hs', 'f.c']),
       unless(doing_ghci, skip),
-      when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))],
+      unless(config.have_RTS_linker, skip)],
      makefile_test, ['ghcilink004'])
 
 test('ghcilink005',
diff --git a/testsuite/tests/ghci/linking/dyn/all.T b/testsuite/tests/ghci/linking/dyn/all.T
index 46ba064c17..550ae1b0d8 100644
--- a/testsuite/tests/ghci/linking/dyn/all.T
+++ b/testsuite/tests/ghci/linking/dyn/all.T
@@ -48,6 +48,7 @@ test('big-obj', [extra_files(['big-obj-c.c', 'big-obj.hs']),
 test('T3372',
      [unless(doing_ghci, skip),
       extra_run_opts('"' + config.libdir + '"'),
+      unless(config.have_RTS_linker, skip),
       # Concurrent GHC sessions is fragile on Windows since we must lock the
       # package database even for read-only access.
       # See Note [Locking package database on Windows] in GHC.PackageDb
diff --git a/testsuite/tests/ghci/prog001/prog001.T b/testsuite/tests/ghci/prog001/prog001.T
index 49aa4861e2..7cd60c0b20 100644
--- a/testsuite/tests/ghci/prog001/prog001.T
+++ b/testsuite/tests/ghci/prog001/prog001.T
@@ -1,7 +1,5 @@
 test('prog001',
      [extra_files(['../shell.hs', 'A.hs', 'B.hs', 'C1.hs', 'D1.hs', 'D2.hs']),
       cmd_prefix('ghciWayFlags=' + config.ghci_way_flags),
-      when(arch('powerpc64') or arch('powerpc64le'),
-           expect_broken_for(11259, ['ghci-ext'])),
-      unless(opsys('mingw32'), extra_ways(['ghci-ext']))],
+      unless(opsys('mingw32') or (not config.have_ext_interp), 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 ede2805d10..0a2b2f1d61 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -11,15 +11,11 @@ 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,
-		  when(arch('powerpc64') or arch('powerpc64le'),
-                       expect_broken_for(11259,['ghci-ext'])),
-                  unless(opsys('mingw32'),extra_ways(['ghci-ext'])) ],
+                  unless(opsys('mingw32') or (not config.have_ext_interp),extra_ways(['ghci-ext'])) ],
                 ghci_script, ['ghci004.script'])
 test('ghci005', combined_output, ghci_script, ['ghci005.script'])
 test('ghci006', [ combined_output,
-                  when(arch('powerpc64') or arch('powerpc64le'),
-                       expect_broken_for(11259,['ghci-ext'])),
-                  unless(opsys('mingw32'),extra_ways(['ghci-ext'])) ],
+                  unless(opsys('mingw32') or (not config.have_ext_interp),extra_ways(['ghci-ext'])) ],
                 ghci_script, ['ghci006.script'])
 test('ghci007', combined_output, ghci_script, ['ghci007.script'])
 test('ghci008', [ combined_output,