aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@mips.com>2018-07-09 15:50:57 +0100
committerMaciej W. Rozycki <macro@mips.com>2018-07-09 15:50:57 +0100
commit8f7fc65182f74dfa8e2aa9f81a1cdf786a3bdbe6 (patch)
treea3c434e6f7f25f4f516efc02cde912f1fd335160 /ld
parent9dcb0ba4457b8845fb704635e824471bf1faf092 (diff)
downloadgdb-8f7fc65182f74dfa8e2aa9f81a1cdf786a3bdbe6.zip
gdb-8f7fc65182f74dfa8e2aa9f81a1cdf786a3bdbe6.tar.gz
gdb-8f7fc65182f74dfa8e2aa9f81a1cdf786a3bdbe6.tar.bz2
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.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/testsuite/lib/ld-lib.exp18
2 files changed, 14 insertions, 9 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index fe9724b..d7d094c 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 cfbefe9..9e63e30 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 ""]