From 2f1392aee192c9fe8781d7c0979659f6d60cd1db Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 12 Dec 2017 13:08:31 +0000 Subject: [PATCH] Fix g++.old-deja/g++.pt/const2.C on Solaris * lib/gcc-dg.exp (process-message): Avoid additional whitespace in $expmsg. From-SVN: r255580 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/lib/gcc-dg.exp | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 09fe88b2155..f259bbffadb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-12-12 Rainer Orth + + * lib/gcc-dg.exp (process-message): Avoid additional whitespace in + $expmsg. + 2017-12-12 Richard Biener PR tree-optimization/83385 diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 98366dc1fc3..899a8355338 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -1103,14 +1103,15 @@ proc process-message { msgproc msgprefix dgargs } { # Remove it from the original expression and move it # to the proper place in the search expression. set expmsg [string range $expmsg [string length $column] end] + set column "$column " } elseif [string match "" [lindex $newentry 0]] { # The specified line number is 0; don't expect a column number. } else { # There is no column number in the search expression, but we # 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 dg-messages [lreplace ${dg-messages} end end $newentry] -- 2.30.2