cmd/go: accept trailing text in compiler errors in tests

This fixes tests that were broken in CL 497716.

Change-Id: I85fa8f093e04a97b7b83e2f6840f6261e08f59e0
Reviewed-on: https://go-review.googlesource.com/c/go/+/497875
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>

diff --git a/src/cmd/go/testdata/script/mod_install_pkg_version.txt b/src/cmd/go/testdata/script/mod_install_pkg_version.txt
index 712375a6f8c6d2863eb2a11fe01ad608b832b923..a4a26ba9f3ee368bec93dabc372fc4eb5d558302 100644 (file)
--- a/src/cmd/go/testdata/script/mod_install_pkg_version.txt
+++ b/src/cmd/go/testdata/script/mod_install_pkg_version.txt
@@ -128,7 +128,7 @@ cd tmp
 go mod init m
 go get example.com/cmd@v1.0.0
 ! go build example.com/cmd/...
-stderr 'err[/\\]err.go:3:9: undefined: DoesNotCompile$'
+stderr 'err[/\\]err.go:3:9: undefined: DoesNotCompile( .*)?$'
 cd ..
 
 go install example.com/cmd/...@v1.0.0

diff --git a/src/cmd/go/testdata/script/mod_vendor_goversion.txt b/src/cmd/go/testdata/script/mod_vendor_goversion.txt
index 9e3618a21848ffcd8ec663c04acc83e756d7551d..838c5575b0b833383bda47de10f166c7406f35fe 100644 (file)
--- a/src/cmd/go/testdata/script/mod_vendor_goversion.txt
+++ b/src/cmd/go/testdata/script/mod_vendor_goversion.txt
@@ -7,7 +7,7 @@
 
 go build example.net/need117
 ! go build example.net/bad114
-stderr '^bad114[/\\]bad114.go:15:2: duplicate method Y$'
+stderr '^bad114[/\\]bad114.go:15:2: duplicate method Y( .*)?$'
 
 
 # With a vendor/modules.txt lacking language versions, the world is topsy-turvy,
@@ -43,7 +43,7 @@ go build example.net/need117
 
 grep '^## explicit; go 1.13$' vendor/modules.txt
 ! go build example.net/bad114
-stderr '^vendor[/\\]example\.net[/\\]bad114[/\\]bad114.go:15:2: duplicate method Y$'
+stderr '^vendor[/\\]example\.net[/\\]bad114[/\\]bad114.go:15:2: duplicate method Y( .+)?$'
 
 -- go.mod --
 module example.net/m