asan-dg.exp (asan_symbolize): Remove all "BFD: " prefixed lines from the output.

	* lib/asan-dg.exp (asan_symbolize): Remove all "BFD: " prefixed lines
	from the output.

From-SVN: r193763

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a42b0013393c8713cf0b1ccb5ceb2cfa3684287a..6c5374a2612ef5cbbe9f3f621430ddd77fb1d1b6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-11-23  Jakub Jelinek  <jakub@redhat.com>
 
+       * lib/asan-dg.exp (asan_symbolize): Remove all "BFD: " prefixed lines
+       from the output.
+
        PR c++/54046
        * g++.dg/warn/Wreturn-type-8.C: New test.
 

diff --git a/gcc/testsuite/lib/asan-dg.exp b/gcc/testsuite/lib/asan-dg.exp
index 9a435d2dc0c162ede7aea35bd28e7ae5db2be867..9d7f39087ddbed5c9dcd4ce31abe13fbaad52764 100644 (file)
--- a/gcc/testsuite/lib/asan-dg.exp
+++ b/gcc/testsuite/lib/asan-dg.exp
@@ -128,7 +128,8 @@ proc asan_symbolize { output } {
            set status [remote_exec host "$addr2line_name" $args]
            if { [lindex $status 0] > 0 } continue
            regsub -all "\r\n" [lindex $status 1] "\n" addr2line_output
-           regsub -all "(^|\n|\r)BFD: \[^\n\r\]*" $addr2line_output "" addr2line_output
+           regsub -all "\[\n\r\]BFD: \[^\n\r\]*" $addr2line_output "" addr2line_output
+           regsub -all "^BFD: \[^\n\r\]*\[\n\r\]" $addr2line_output "" addr2line_output
            set addr2line_output [regexp -inline -all -line "^\[^\n\r]*" $addr2line_output]
            set idx 0
            foreach val $arr($key) {