test: migrate remaining files to go:build syntax

Most of the test cases in the test directory use the new go:build syntax
already. Convert the rest. In general, try to place the build constraint
line below the test directive comment in more places.

For golang#41184.
For golang#60268.

Change-Id: I11c41a0642a8a26dc2eda1406da908645bbc005b
Cq-Include-Trybots: luci.golang.try:gotip-linux-386-longtest,gotip-linux-amd64-longtest,gotip-windows-amd64-longtest
Reviewed-on: https://go-review.googlesource.com/c/go/+/536236
Reviewed-by: Ian Lance Taylor <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: dmitshur

src/cmd/compile/internal/types2/stdlib_test.go

@@ -191,7 +191,7 @@ func firstComment(filename string) (first string) {
 		}
 		text = strings.TrimSpace(text[2:])
 
-		if strings.HasPrefix(text, "+build ") {
+		if strings.HasPrefix(text, "go:build ") {
 			panic("skip")
 		}
 		if first == "" {

src/go/types/stdlib_test.go

@@ -192,7 +192,7 @@ func firstComment(filename string) string {
 				lit = lit[:len(lit)-2]
 			}
 			contents := strings.TrimSpace(lit[2:])
-			if strings.HasPrefix(contents, "+build ") {
+			if strings.HasPrefix(contents, "go:build ") {
 				return "skip"
 			}
 			if first == "" {

test/abi/bad_internal_offsets.go

@@ -1,7 +1,6 @@
 // compile
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/double_nested_addressed_struct.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/double_nested_struct.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/f_ret_z_not.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/fibish.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/fibish_closure.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/leaf.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/leaf2.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/many_int_input.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/many_intstar_input.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/more_intstar_input.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/named_results.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/named_return_stuff.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/reg_not_ssa.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2023 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/return_stuff.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/s_sif_sif.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/spills3.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/spills4.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/struct_3_string_input.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/struct_lower_1.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/too_big_to_ssa.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/uglyfib.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/abi/wrapdefer_largetmp.go

@@ -1,7 +1,6 @@
 // run
 
 //go:build !wasm
-// +build !wasm
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/chanlinear.go

@@ -1,6 +1,7 @@
-// +build darwin linux
 // run
 
+//go:build darwin || linux
+
 // Copyright 2014 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.

test/checkbce.go

@@ -1,6 +1,7 @@
-// +build amd64,!gcflags_noopt
 // errorcheck -0 -d=ssa/check_bce/debug=3
 
+//go:build amd64 && !gcflags_noopt
+
 // 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.

test/closure3.go

@@ -1,7 +1,6 @@
 // errorcheckandrundir -0 -m -d=inlfuncswithclosures=1
 
 //go:build !goexperiment.newinliner
-// +build !goexperiment.newinliner
 
 // Copyright 2017 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/codegen/clobberdead.go

@@ -1,6 +1,6 @@
 // asmcheck -gcflags=-clobberdead
 
-// +build amd64 arm64
+//go:build amd64 || arm64
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/codegen/clobberdeadreg.go

@@ -1,6 +1,6 @@
 // asmcheck -gcflags=-clobberdeadreg
 
-// +build amd64
+//go:build amd64
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/codegen/retpoline.go

@@ -1,6 +1,7 @@
-// +build amd64
 // asmcheck -gcflags=-spectre=ret
 
+//go:build amd64
+
 package codegen
 
 func CallFunc(f func()) {

test/codegen/spectre.go

@@ -1,6 +1,7 @@
-// +build amd64
 // asmcheck -gcflags=-spectre=index
 
+//go:build amd64
+
 // Copyright 2020 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.

test/codegen/structs.go

@@ -1,7 +1,6 @@
 // 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

test/fixedbugs/bug248.go

@@ -1,6 +1,7 @@
-// +build !nacl,!js,!plan9
 // errorcheckandrundir -1
 
+//go:build !nacl && !js && !plan9
+
 // Copyright 2009 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.

test/fixedbugs/bug369.go

@@ -1,6 +1,7 @@
-// +build !nacl,!js,!wasip1,gc
 // run
 
+//go:build !nacl && !js && !wasip1 && gc
+
 // Copyright 2011 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.

test/fixedbugs/bug385_32.go

@@ -1,6 +1,7 @@
-// +build 386 amd64p32 arm
 // errorcheck
 
+//go:build 386 || amd64p32 || arm
+
 // Copyright 2011 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.

test/fixedbugs/bug385_64.go

@@ -1,6 +1,7 @@
-// +build amd64
 // errorcheck
 
+//go:build amd64
+
 // Copyright 2011 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.

test/fixedbugs/bug513.go

@@ -1,6 +1,6 @@
 // run -race -gcflags=all=-d=checkptr=0
-// +build linux,amd64 linux,ppc64le darwin,amd64 freebsd,amd64 netbsd,amd64 windows,amd64
-// +build cgo
+
+//go:build ((linux && amd64) || (linux && ppc64le) || (darwin && amd64) || (freebsd && amd64) || (netbsd && amd64) || (windows && amd64)) && cgo
 
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/fixedbugs/issue10607.go

@@ -1,8 +1,7 @@
-//go:build linux && !ppc64 && gc && cgo
-// +build linux,!ppc64,gc,cgo
-
 // run
 
+//go:build linux && !ppc64 && gc && cgo
+
 // Copyright 2015 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.

test/fixedbugs/issue10958.go

@@ -1,6 +1,7 @@
-// +build !nacl,!js,disabled_see_issue_18589
 // buildrun -t 10  -gcflags=-d=ssa/insert_resched_checks/on,ssa/check/on
 
+//go:build !nacl && !js && disabled_see_issue_18589
+
 // 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.

test/fixedbugs/issue11326b.go

@@ -2,7 +2,7 @@
 
 // Does not work with gccgo, which uses a smaller (but still permitted)
 // exponent size.
-// +build !gccgo
+//go:build !gccgo
 
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

test/fixedbugs/issue11656.dir/asm.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 package main
 

test/fixedbugs/issue11656.dir/asm_generic.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !ppc64 && !ppc64le
-// +build !ppc64,!ppc64le
 
 package main
 

test/fixedbugs/issue11656.go

@@ -17,6 +17,5 @@
 // able to unwind past that point.
 
 //go:build !windows && !wasm && !gccgo
-// +build !windows,!wasm,!gccgo
 
 package ignored

test/fixedbugs/issue11771.go

@@ -1,6 +1,7 @@
-// +build !nacl,!js,!wasip1,gc
 // run
 
+//go:build !nacl && !js && !wasip1 && gc
+
 // Copyright 2015 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.

test/fixedbugs/issue12411.go

@@ -1,6 +1,7 @@
-// +build !386
 // run
 
+//go:build !386
+
 // Copyright 2015 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.

test/fixedbugs/issue13265.go

@@ -1,5 +1,6 @@
 // errorcheck -0 -race
-// +build linux,amd64 linux,ppc64le darwin,amd64 freebsd,amd64 netbsd,amd64 windows,amd64
+
+//go:build (linux && amd64) || (linux && ppc64le) || (darwin && amd64) || (freebsd && amd64) || (netbsd && amd64) || (windows && amd64)
 
 // Copyright 2017 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style