cmd/compile,cmd/go: fix long test builders

CL 361411 improved error message for go version requirement, but forgot
to update the test in cmd/go to match new error message. That causes
longtest builders failed.

This CL changes mod_vendor_goversion.txt to match compiler error, and
limit fixedbugs/issue49368.go to run with -G=3 only.

Updates #49368

Change-Id: I125fe0a8c2a1595066d39c03e97819e7a1274e0a
Reviewed-on: https://go-review.googlesource.com/c/go/+/361963
Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>

diff --git a/src/cmd/go/testdata/script/mod_vendor_goversion.txt b/src/cmd/go/testdata/script/mod_vendor_goversion.txt
index a92eb73d274da0bea4c5cc0fe83a8e379c800864..9e3618a21848ffcd8ec663c04acc83e756d7551d 100644 (file)
--- a/src/cmd/go/testdata/script/mod_vendor_goversion.txt
+++ b/src/cmd/go/testdata/script/mod_vendor_goversion.txt
@@ -26,7 +26,7 @@ go mod vendor
 ! grep 1.17 vendor/modules.txt
 ! go build example.net/need117
 stderr '^vendor[/\\]example\.net[/\\]need117[/\\]need117.go:5:1[89]:'
-stderr 'conversion of slices to array pointers only supported as of -lang=go1\.17'
+stderr 'conversion of slices to array pointers requires go1\.17 or later'
 
 ! grep 1.13 vendor/modules.txt
 go build example.net/bad114

diff --git a/test/fixedbugs/issue49368.go b/test/fixedbugs/issue49368.go
index 2339048e3d12b76325cf6af1c05bbc89f992401f..4cbf351ae0731eaf741eb34c68b8381a27225a94 100644 (file)
--- a/test/fixedbugs/issue49368.go
+++ b/test/fixedbugs/issue49368.go
@@ -1,4 +1,4 @@
-// errorcheck -lang=go1.17
+// errorcheck -G=3 -lang=go1.17
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style