From 517c4166988047036a57f4bb36e00458b51ade62 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 30 Dec 2016 12:39:59 +0200 Subject: [PATCH] ld testsuite: Sanitize output from ld Leading dashes from an LD error message confuse send_log, because the string is taken to be an option. This patch fixes the following DejaGnu error: --defsym:1: undefined symbol `foo2' referenced in expression failed with: <--defsym:1: undefined symbol `foo2' referenced in expression>, no expected output ERROR: tcl error sourcing .../ld/testsuite/ld-gc/gc.exp. ERROR: usage: send [args] string while executing "send_log "$comp_output\n"" (procedure "run_dump_test" line 376) * testsuite/lib/ld-lib.exp (run_dump_test): Pass -- to send_log. Signed-off-by: Dimitar Dimitrov --- ld/ChangeLog | 4 ++++ ld/testsuite/lib/ld-lib.exp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index be179edce5..144672e68f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2016-12-31 Dimitar Dimitrov + + * testsuite/lib/ld-lib.exp (run_dump_test): Pass -- to send_log. + 2016-12-28 Alan Modra PR ld/20995 diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index a2be49b25f..de0848a366 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -857,7 +857,7 @@ proc run_dump_test { name {extra_options {}} } { remote_file build delete "ld.tmp" if { [lindex $cmdret 0] != 0 || ![string match "" $comp_output] } then { - send_log "$comp_output\n" + send_log -- "$comp_output\n" verbose "$comp_output" 3 set exitstat "succeeded" @@ -880,7 +880,7 @@ proc run_dump_test { name {extra_options {}} } { if { [lindex $cmdret 0] != 0 \ || ![string match "" $comp_output] } { - send_log "$comp_output\n" + send_log -- "$comp_output\n" verbose "$comp_output" 3 set exitstat "succeeded" @@ -996,7 +996,7 @@ proc run_dump_test { name {extra_options {}} } { } else { verbose -log "$exitstat with: <$comp_output>, no expected output" } - send_log "$comp_output\n" + send_log -- "$comp_output\n" verbose "$comp_output" 3 if { (($check_ld(source) == "") == ($comp_output == "")) \ -- 2.34.1