cmd/internal/testdir: pass if GOEXPERIMENT=cgocheck2 is set

Some testdir tests fail if GOEXPERIMENT=cgocheck2 is set. Fix this by
skipping these tests.

Change-Id: I58d4ef0cceb86bcf93220b4a44de9b9dc4879b16
Reviewed-on: https://go-review.googlesource.com/c/go/+/499675
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/test/codegen/structs.go b/test/codegen/structs.go
index c4bcb55c637cdb3d98d9a38fdfdaf210f14dfa86..fc49a69375497eeafea157ec6735f021fdf8f18f 100644 (file)
--- a/test/codegen/structs.go
+++ b/test/codegen/structs.go
@@ -1,5 +1,8 @@
 // asmcheck
 
+//go:build !goexperiment.cgocheck2
+// +build !goexperiment.cgocheck2
+
 // Copyright 2018 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

diff --git a/test/fixedbugs/issue15747.go b/test/fixedbugs/issue15747.go
index c7ef96d5816388605ae595a81388be1e9bbe2623..7825958066118e57fdd5d8e0303b31ca39298642 100644 (file)
--- a/test/fixedbugs/issue15747.go
+++ b/test/fixedbugs/issue15747.go
@@ -1,5 +1,8 @@
 // errorcheck -0 -live
 
+//go:build !goexperiment.cgocheck2
+// +build !goexperiment.cgocheck2
+
 // Copyright 2016 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

diff --git a/test/fixedbugs/issue20250.go b/test/fixedbugs/issue20250.go
index a6283c759548d278733fcf7fb8f1a5fcde586c51..c739b6fb125ad51728036bff5209b04caf11e410 100644 (file)
--- a/test/fixedbugs/issue20250.go
+++ b/test/fixedbugs/issue20250.go
@@ -1,5 +1,8 @@
 // errorcheck -0 -live -l
 
+//go:build !goexperiment.cgocheck2
+// +build !goexperiment.cgocheck2
+
 // Copyright 2017 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
@@ -16,7 +19,7 @@ type T struct {
 
 func f(a T) { // ERROR "live at entry to f: a$"
        var e interface{} // ERROR "stack object e interface \{\}$"
-       func() { // ERROR "live at entry to f.func1: &e a$"
+       func() {          // ERROR "live at entry to f.func1: &e a$"
                e = a.s // ERROR "live at call to convT: &e$" "stack object a T$"
        }()
        // Before the fix, both a and e were live at the previous line.