This patch to the Go testsuite driver retains any characters at the
end of an ERROR line in a test.  This is needed for at least one
upcoming test.  Bootstrapped and ran Go testsuite on
x86_64-pc-linux-gnu.  Committed to mainline.

Ian

* go.test/go-test.exp (errchk): Retain any characters at the end
of the comment.
diff --git a/gcc/testsuite/go.test/go-test.exp 
b/gcc/testsuite/go.test/go-test.exp
index b03cb16990d..c1b27c09236 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -124,8 +124,7 @@ proc errchk { test opts } {
        # to
        #   // { dg-error {string} }
        # The latter is what go-dg-runtest expects.
-       # Retain an optional trailing */, for syntax/semi6.go.
-       regsub {// (GCCGO_)?ERROR "([^"]*)" *(\*/)?$} $copy_line "// \{ 
dg-error \{\\2\} \}\\3" out_line
+       regsub {// (GCCGO_)?ERROR "([^"]*)"([^"]*)$} $copy_line "// \{ dg-error 
\{\\2\} \}\\3" out_line
 
        puts $fdout $out_line
     }

Reply via email to