Commit 2f1392ae by Rainer Orth Committed by Rainer Orth

Fix g++.old-deja/g++.pt/const2.C on Solaris

	* lib/gcc-dg.exp (process-message): Avoid additional whitespace in
	$expmsg.

From-SVN: r255580
parent a365945b
2017-12-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* lib/gcc-dg.exp (process-message): Avoid additional whitespace in
$expmsg.
2017-12-12 Richard Biener <rguenther@suse.de> 2017-12-12 Richard Biener <rguenther@suse.de>
PR tree-optimization/83385 PR tree-optimization/83385
......
...@@ -1103,14 +1103,15 @@ proc process-message { msgproc msgprefix dgargs } { ...@@ -1103,14 +1103,15 @@ proc process-message { msgproc msgprefix dgargs } {
# Remove it from the original expression and move it # Remove it from the original expression and move it
# to the proper place in the search expression. # to the proper place in the search expression.
set expmsg [string range $expmsg [string length $column] end] set expmsg [string range $expmsg [string length $column] end]
set column "$column "
} elseif [string match "" [lindex $newentry 0]] { } elseif [string match "" [lindex $newentry 0]] {
# The specified line number is 0; don't expect a column number. # The specified line number is 0; don't expect a column number.
} else { } else {
# There is no column number in the search expression, but we # There is no column number in the search expression, but we
# should expect one in the message itself. # should expect one in the message itself.
set column {[0-9]+:} set column {[0-9]+: }
} }
set expmsg "$column $msgprefix\[^\n\]*$expmsg" set expmsg "$column$msgprefix\[^\n\]*$expmsg"
set newentry [lreplace $newentry 2 2 $expmsg] set newentry [lreplace $newentry 2 2 $expmsg]
set dg-messages [lreplace ${dg-messages} end end $newentry] set dg-messages [lreplace ${dg-messages} end end $newentry]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment