aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2015-07-28 19:14:37 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2015-08-04 11:25:37 +0100
commit9c98104c4c8f558176311dad055897c45b7d8032 (patch)
treeab8a1683023aba55a5fbc6c0fb09ea713d85c261
parentbb57e4c7bd1d27c45195efd0b7a612bac831d2df (diff)
downloadgdb-9c98104c4c8f558176311dad055897c45b7d8032.zip
gdb-9c98104c4c8f558176311dad055897c45b7d8032.tar.gz
gdb-9c98104c4c8f558176311dad055897c45b7d8032.tar.bz2
ld: map option for run_dump_test requires no program.
When using run_dump_test with the map option to compare the linker map file produced, no additional dump program should be required. A dump program can still be given if needed, but leaving it off will no longer produce an error. ld/testsuite/ChangeLog: * ld/ld-lib.exp (run_dump_test): When using the map option, no program is required.
-rw-r--r--ld/testsuite/ChangeLog5
-rw-r--r--ld/testsuite/lib/ld-lib.exp5
2 files changed, 10 insertions, 0 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index aaecbeb..727bcad 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2015-08-04 Andrew Burgess <andrew.burgess@embecosm.com>
+ * ld/ld-lib.exp (run_dump_test): When using the map option, no
+ program is required.
+
+2015-08-04 Andrew Burgess <andrew.burgess@embecosm.com>
+
* ld/ld-lib.exp (run_dump_test): Add error_output and
warning_output options.
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 8bb06ff..6904499 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -761,6 +761,7 @@ proc run_dump_test { name {extra_options {}} } {
}
}
if { $program == "" \
+ && $opts(map) == "" \
&& $opts(warning) == "" \
&& $opts(warning_output) == "" \
&& $opts(error) == "" \
@@ -995,6 +996,10 @@ proc run_dump_test { name {extra_options {}} } {
} else {
pass "$testname (map file check)"
}
+
+ if { $program == "" } then {
+ return
+ }
}
} else {
set objfile "tmpdir/dump0.o"