diff options
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index e726c76..91ad204 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-05-17 Hans-Peter Nilsson <hp@axis.com> + + * lib/ld-lib.exp (run_dump_test): For options "warning" and + "error", append to earlier option values without adding a space. + 2012-05-17 Alan Modra <amodra@gmail.com> * ld-m68k/tls-ld-1.d: Update. diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 9797dff..a481ce7 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -623,7 +623,18 @@ proc run_dump_test { name } { if { $opt_name == "as" || $opt_name == "ld" } { set opt_val [subst $opt_val] } - set opts($opt_name) [concat $opts($opt_name) $opt_val] + + # Append differently whether it's a message (without space) or + # an option or list (with space). + switch -- $opt_name { + warning - + error { + append opts($opt_name) $opt_val + } + default { + set opts($opt_name) [concat $opts($opt_name) $opt_val] + } + } } foreach opt { as ld } { regsub {\[big_or_little_endian\]} $opts($opt) \ |