From 8f7fc65182f74dfa8e2aa9f81a1cdf786a3bdbe6 Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@mips.com>
Date: Mon, 9 Jul 2018 15:50:57 +0100
Subject: [PATCH] LD/testsuite: run_dump_test: Use the intended test name ASAP

Bring the LD implementation of `run_dump_test' in line with its binutils
and GAS counterparts and use the intended test name, from the `name' tag
if set, for test status reporting as soon as it is available.

	ld/
	* testsuite/lib/ld-lib.exp (run_dump_test): Move the setting of
	`testname' earlier on and use it for test status reporting.
---
 ld/ChangeLog                |  5 +++++
 ld/testsuite/lib/ld-lib.exp | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index fe9724bd6c7..d7d094c8b23 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-09  Maciej W. Rozycki  <macro@mips.com>
+
+	* testsuite/lib/ld-lib.exp (run_dump_test): Move the setting of
+	`testname' earlier on and use it for test status reporting.
+
 2018-07-09  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/ld-discard/extern.d: Remove m68hc12 xfail.
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index cfbefe9028e..9e63e30ddcc 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -746,6 +746,12 @@ proc run_dump_test { name {extra_options {}} } {
 	    [big_or_little_endian] opts($opt)
     }
 
+    if { $opts(name) == "" } {
+	set testname "$subdir/$name"
+    } else {
+	set testname $opts(name)
+    }
+
     # Decide early whether we should run the test for this target.
     if { [llength $opts(target)] > 0 } {
 	set targmatch 0
@@ -782,7 +788,7 @@ proc run_dump_test { name {extra_options {}} } {
 		readelf	{ set program readelf }
 		default
 		{ perror "unrecognized program option $opts(PROG) in $file.d"
-		  unresolved $subdir/$name
+		  unresolved $testname
 		  return }
 	    }
 	} else {
@@ -791,7 +797,7 @@ proc run_dump_test { name {extra_options {}} } {
 		if {$opts($p) != ""} {
 		    if {$program != ""} {
 			perror "ambiguous dump program in $file.d"
-			unresolved $subdir/$name
+			unresolved $testname
 			return
 		    } else {
 			set program $p
@@ -806,17 +812,11 @@ proc run_dump_test { name {extra_options {}} } {
                  && $opts(error) == "" \
                  && $opts(error_output) == "" } {
 	    perror "dump program unspecified in $file.d"
-	    unresolved $subdir/$name
+	    unresolved $testname
 	    return
 	}
     }
 
-    if { $opts(name) == "" } {
-	set testname "$subdir/$name"
-    } else {
-	set testname $opts(name)
-    }
-
     if { $opts(source) == "" } {
 	set sourcefiles [list ${file}.s]
 	set asflags [list ""]
-- 
2.30.2