[PATCH 2/8] s390: Explicitly list linker dump tests

[Jens Remus]

Generating the linker dump test list using file globbing makes it
difficult to exclude specific tests under certain circumstances.  List
them explicitly instead.  This enables to add tests in the future that
can be excluded.  While at it reorganize how s390 linker tests get
run for s390x.

ld/testsuite/
	* ld-s390/s390.exp: Reorganize and explicitly list linker dump
	tests.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
---
 ld/testsuite/ld-s390/s390.exp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/ld/testsuite/ld-s390/s390.exp b/ld/testsuite/ld-s390/s390.exp
index d91eeacc730a..b5a9ea3c64a1 100644
--- a/ld/testsuite/ld-s390/s390.exp
+++ b/ld/testsuite/ld-s390/s390.exp
@@ -127,18 +127,15 @@ set s390xtests {
      "plt_64-1_eh"}
 }
 
-if [istarget "s390-*-*"] {
+if { ([istarget "s390-*-*"] || [istarget "s390x-*-*"]) } {
     run_ld_link_tests $s390tests
+
+    run_dump_test "pr26918-1"
+    run_dump_test "reloccheck-1"
+    run_dump_test "reloctlsle-1"
+
 }
 
 if [istarget "s390x-*-*"] {
-    run_ld_link_tests $s390tests
     run_ld_link_tests $s390xtests
 }
-
-set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
-foreach t $test_list {
-    # We need to strip the ".d", but can leave the dirname.
-    verbose [file rootname $t]
-    run_dump_test [file rootname $t]
-}
-- 
2.45.2