This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH 2/3] 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.
---
 ld/testsuite/ChangeLog      | 5 +++++
 ld/testsuite/lib/ld-lib.exp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 3c787b4..ea0b888 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2015-07-28  Andrew Burgess  <andrew.burgess@embecosm.com>
 
+	* ld/ld-lib.exp (run_dump_test): When using the map option, no
+	program is required.
+
+2015-07-28  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"
-- 
2.4.0


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]