From 8be965c5f058f79554ec3376afac994e6e3ad1b7 Mon Sep 17 00:00:00 2001
From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Thu, 27 Apr 2017 17:53:28 +0100
Subject: [PATCH] ld: Find and run some tests using a wildcard pattern

Find the ld-script/provide-*.d tests using a wildcard, then run them in
a loop.  This will make it easier to add more tests in the future.  Some
associated clean up is required.

ld/ChangeLog:

	* testsuite/ld-scripts/provide-3.d: Add xfail directive.
	* testsuite/ld-scripts/provide-4.d: Use new map file name.
	* testsuite/ld-scripts/provide-5.d: Use new map file name.
	* testsuite/ld-scripts/provide-4-map.d: Renamed to...
	* testsuite/ld-scripts/provide-4.map: ...this.
	* testsuite/ld-scripts/provide-5-map.d: Renamed to...
	* testsuite/ld-scripts/provide-5.map: ...this.
	* testsuite/ld-scripts/provide.exp: Move xfail into provide-3.d
	file, and run tests in a loop.
---
 ld/ChangeLog                                         | 12 ++++++++++++
 ld/testsuite/ld-scripts/provide-3.d                  |  1 +
 ld/testsuite/ld-scripts/provide-4.d                  |  2 +-
 .../ld-scripts/{provide-4-map.d => provide-4.map}    |  0
 ld/testsuite/ld-scripts/provide-5.d                  |  2 +-
 .../ld-scripts/{provide-5-map.d => provide-5.map}    |  0
 ld/testsuite/ld-scripts/provide.exp                  | 12 ++++++------
 7 files changed, 21 insertions(+), 8 deletions(-)
 rename ld/testsuite/ld-scripts/{provide-4-map.d => provide-4.map} (100%)
 rename ld/testsuite/ld-scripts/{provide-5-map.d => provide-5.map} (100%)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1357b89175b..f96517e68fc 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,15 @@
+2018-01-11  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* testsuite/ld-scripts/provide-3.d: Add xfail directive.
+	* testsuite/ld-scripts/provide-4.d: Use new map file name.
+	* testsuite/ld-scripts/provide-5.d: Use new map file name.
+	* testsuite/ld-scripts/provide-4-map.d: Renamed to...
+	* testsuite/ld-scripts/provide-4.map: ...this.
+	* testsuite/ld-scripts/provide-5-map.d: Renamed to...
+	* testsuite/ld-scripts/provide-5.map: ...this.
+	* testsuite/ld-scripts/provide.exp: Move xfail into provide-3.d
+	file, and run tests in a loop.
+
 2018-01-11  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* ldexp.c (exp_print_tree): Use '=' instead of ',' when printing
diff --git a/ld/testsuite/ld-scripts/provide-3.d b/ld/testsuite/ld-scripts/provide-3.d
index c8b12dafe7f..a5855e6b473 100644
--- a/ld/testsuite/ld-scripts/provide-3.d
+++ b/ld/testsuite/ld-scripts/provide-3.d
@@ -1,3 +1,4 @@
 #source: provide-3.s
 #ld: -T provide-3.t
 #error: symbol defined in linker script and object file
+#xfail: "*-*-*"
diff --git a/ld/testsuite/ld-scripts/provide-4.d b/ld/testsuite/ld-scripts/provide-4.d
index a7d37e3c347..18699f221da 100644
--- a/ld/testsuite/ld-scripts/provide-4.d
+++ b/ld/testsuite/ld-scripts/provide-4.d
@@ -1,7 +1,7 @@
 #source: provide-2.s
 #ld: -T provide-4.t
 #PROG: nm
-#map: provide-4-map.d
+#map: provide-4.map
 #...
 0+3 A baz
 0+2000 D foo
diff --git a/ld/testsuite/ld-scripts/provide-4-map.d b/ld/testsuite/ld-scripts/provide-4.map
similarity index 100%
rename from ld/testsuite/ld-scripts/provide-4-map.d
rename to ld/testsuite/ld-scripts/provide-4.map
diff --git a/ld/testsuite/ld-scripts/provide-5.d b/ld/testsuite/ld-scripts/provide-5.d
index 1b14fa6a2fe..2a8baec605b 100644
--- a/ld/testsuite/ld-scripts/provide-5.d
+++ b/ld/testsuite/ld-scripts/provide-5.d
@@ -1,6 +1,6 @@
 #source: provide-5.s
 #ld: -T provide-5.t
 #PROG: nm
-#map: provide-5-map.d
+#map: provide-5.map
 #...
 0+10 A foo
diff --git a/ld/testsuite/ld-scripts/provide-5-map.d b/ld/testsuite/ld-scripts/provide-5.map
similarity index 100%
rename from ld/testsuite/ld-scripts/provide-5-map.d
rename to ld/testsuite/ld-scripts/provide-5.map
diff --git a/ld/testsuite/ld-scripts/provide.exp b/ld/testsuite/ld-scripts/provide.exp
index 3a0b2e8070f..01bf934d17e 100644
--- a/ld/testsuite/ld-scripts/provide.exp
+++ b/ld/testsuite/ld-scripts/provide.exp
@@ -36,11 +36,11 @@ if [istarget "x86_64-*-mingw*"] then {
   set LDFLAGS "$LDFLAGS --image-base 0"
 }
 
-run_dump_test provide-1
-run_dump_test provide-2
-setup_xfail *-*-*
-run_dump_test provide-3
-run_dump_test provide-4
-run_dump_test provide-5
+set test_list [lsort [glob -nocomplain $srcdir/$subdir/provide-*.d]]
+foreach test_file $test_list {
+    set test_name [file rootname $test_file]
+    verbose $test_name
+    run_dump_test $test_name
+}
 
 set LDFLAGS "$saved_LDFLAGS"
-- 
2.30.2