cmd/compile: move more compiler tests to new test infrastructure

Update #26469

Change-Id: I1188e49cde1bda11506afef6b6e3f34c6ff45ea5
Reviewed-on: https://go-review.googlesource.com/127115
Run-TryBot: Keith Randall <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: David Chase <[email protected]>

Author: randall77

src/cmd/compile/internal/gc/ssa_test.go

@@ -26,10 +26,6 @@ func runTest(t *testing.T, filename string, flags ...string) {
 	t.Parallel()
 	doTest(t, filename, "run", flags...)
 }
-func buildTest(t *testing.T, filename string, flags ...string) {
-	t.Parallel()
-	doTest(t, filename, "build", flags...)
-}
 func doTest(t *testing.T, filename string, kind string, flags ...string) {
 	testenv.MustHaveGoBuild(t)
 	gotool := testenv.GoToolPath(t)
@@ -227,22 +223,6 @@ func TestCode(t *testing.T) {
 	}
 }
 
-func TestChan(t *testing.T) { runTest(t, "chan.go") }
-
-func TestCompound(t *testing.T) { runTest(t, "compound.go") }
-
-func TestCtl(t *testing.T) { runTest(t, "ctl.go") }
-
-func TestLoadStore(t *testing.T) { runTest(t, "loadstore.go") }
-
-func TestMap(t *testing.T) { runTest(t, "map.go") }
-
-func TestRegalloc(t *testing.T) { runTest(t, "regalloc.go") }
-
-func TestString(t *testing.T) { runTest(t, "string.go") }
-
-func TestDeferNoReturn(t *testing.T) { buildTest(t, "deferNoReturn.go") }
-
 // TestClosure tests closure related behavior.
 func TestClosure(t *testing.T) { runTest(t, "closure.go") }
 

src/cmd/compile/internal/gc/testdata/chan.go renamed to src/cmd/compile/internal/gc/testdata/chan_test.go

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// chan_ssa.go tests chan operations.
+// chan.go tests chan operations.
 package main
 
-import "fmt"
-
-var failed = false
+import "testing"
 
 //go:noinline
 func lenChan_ssa(v chan int) int {
@@ -19,55 +17,47 @@ func capChan_ssa(v chan int) int {
 	return cap(v)
 }
 
-func testLenChan() {
+func testLenChan(t *testing.T) {
 
 	v := make(chan int, 10)
 	v <- 1
 	v <- 1
 	v <- 1
 
 	if want, got := 3, lenChan_ssa(v); got != want {
-		fmt.Printf("expected len(chan) = %d, got %d", want, got)
-		failed = true
+		t.Errorf("expected len(chan) = %d, got %d", want, got)
 	}
 }
 
-func testLenNilChan() {
+func testLenNilChan(t *testing.T) {
 
 	var v chan int
 	if want, got := 0, lenChan_ssa(v); got != want {
-		fmt.Printf("expected len(nil) = %d, got %d", want, got)
-		failed = true
+		t.Errorf("expected len(nil) = %d, got %d", want, got)
 	}
 }
 
-func testCapChan() {
+func testCapChan(t *testing.T) {
 
 	v := make(chan int, 25)
 
 	if want, got := 25, capChan_ssa(v); got != want {
-		fmt.Printf("expected cap(chan) = %d, got %d", want, got)
-		failed = true
+		t.Errorf("expected cap(chan) = %d, got %d", want, got)
 	}
 }
 
-func testCapNilChan() {
+func testCapNilChan(t *testing.T) {
 
 	var v chan int
 	if want, got := 0, capChan_ssa(v); got != want {
-		fmt.Printf("expected cap(nil) = %d, got %d", want, got)
-		failed = true
+		t.Errorf("expected cap(nil) = %d, got %d", want, got)
 	}
 }
 
-func main() {
-	testLenChan()
-	testLenNilChan()
-
-	testCapChan()
-	testCapNilChan()
+func TestChan(t *testing.T) {
+	testLenChan(t)
+	testLenNilChan(t)
 
-	if failed {
-		panic("failed")
-	}
+	testCapChan(t)
+	testCapNilChan(t)
 }

src/cmd/compile/internal/gc/testdata/compound.go renamed to src/cmd/compile/internal/gc/testdata/compound_test.go

@@ -1,5 +1,3 @@
-// run
-
 // 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.
@@ -8,7 +6,9 @@
 
 package main
 
-import "fmt"
+import (
+	"testing"
+)
 
 func string_ssa(a, b string, x bool) string {
 	s := ""
@@ -20,16 +20,14 @@ func string_ssa(a, b string, x bool) string {
 	return s
 }
 
-func testString() {
+func testString(t *testing.T) {
 	a := "foo"
 	b := "barz"
 	if want, got := a, string_ssa(a, b, true); got != want {
-		fmt.Printf("string_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("string_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
 	}
 	if want, got := b, string_ssa(a, b, false); got != want {
-		fmt.Printf("string_ssa(%v, %v, false) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("string_ssa(%v, %v, false) = %v, want %v\n", a, b, got, want)
 	}
 }
 
@@ -55,31 +53,27 @@ func complex128_ssa(a, b complex128, x bool) complex128 {
 	return c
 }
 
-func testComplex64() {
+func testComplex64(t *testing.T) {
 	var a complex64 = 1 + 2i
 	var b complex64 = 3 + 4i
 
 	if want, got := a, complex64_ssa(a, b, true); got != want {
-		fmt.Printf("complex64_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("complex64_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
 	}
 	if want, got := b, complex64_ssa(a, b, false); got != want {
-		fmt.Printf("complex64_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("complex64_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
 	}
 }
 
-func testComplex128() {
+func testComplex128(t *testing.T) {
 	var a complex128 = 1 + 2i
 	var b complex128 = 3 + 4i
 
 	if want, got := a, complex128_ssa(a, b, true); got != want {
-		fmt.Printf("complex128_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("complex128_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
 	}
 	if want, got := b, complex128_ssa(a, b, false); got != want {
-		fmt.Printf("complex128_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("complex128_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
 	}
 }
 
@@ -93,16 +87,14 @@ func slice_ssa(a, b []byte, x bool) []byte {
 	return s
 }
 
-func testSlice() {
+func testSlice(t *testing.T) {
 	a := []byte{3, 4, 5}
 	b := []byte{7, 8, 9}
 	if want, got := byte(3), slice_ssa(a, b, true)[0]; got != want {
-		fmt.Printf("slice_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("slice_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
 	}
 	if want, got := byte(7), slice_ssa(a, b, false)[0]; got != want {
-		fmt.Printf("slice_ssa(%v, %v, false) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("slice_ssa(%v, %v, false) = %v, want %v\n", a, b, got, want)
 	}
 }
 
@@ -116,28 +108,21 @@ func interface_ssa(a, b interface{}, x bool) interface{} {
 	return s
 }
 
-func testInterface() {
+func testInterface(t *testing.T) {
 	a := interface{}(3)
 	b := interface{}(4)
 	if want, got := 3, interface_ssa(a, b, true).(int); got != want {
-		fmt.Printf("interface_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("interface_ssa(%v, %v, true) = %v, want %v\n", a, b, got, want)
 	}
 	if want, got := 4, interface_ssa(a, b, false).(int); got != want {
-		fmt.Printf("interface_ssa(%v, %v, false) = %v, want %v\n", a, b, got, want)
-		failed = true
+		t.Errorf("interface_ssa(%v, %v, false) = %v, want %v\n", a, b, got, want)
 	}
 }
 
-var failed = false
-
-func main() {
-	testString()
-	testSlice()
-	testInterface()
-	testComplex64()
-	testComplex128()
-	if failed {
-		panic("failed")
-	}
+func TestCompound(t *testing.T) {
+	testString(t)
+	testSlice(t)
+	testInterface(t)
+	testComplex64(t)
+	testComplex128(t)
 }

src/cmd/compile/internal/gc/testdata/ctl.go renamed to src/cmd/compile/internal/gc/testdata/ctl_test.go

@@ -1,5 +1,3 @@
-// run
-
 // 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.
@@ -8,6 +6,8 @@
 
 package main
 
+import "testing"
+
 // nor_ssa calculates NOR(a, b).
 // It is implemented in a way that generates
 // phi control values.
@@ -25,7 +25,7 @@ func nor_ssa(a, b bool) bool {
 	return true
 }
 
-func testPhiControl() {
+func testPhiControl(t *testing.T) {
 	tests := [...][3]bool{ // a, b, want
 		{false, false, true},
 		{true, false, false},
@@ -37,8 +37,7 @@ func testPhiControl() {
 		got := nor_ssa(a, b)
 		want := test[2]
 		if want != got {
-			print("nor(", a, ", ", b, ")=", want, " got ", got, "\n")
-			failed = true
+			t.Errorf("nor(%t, %t)=%t got %t", a, b, want, got)
 		}
 	}
 }
@@ -50,10 +49,9 @@ func emptyRange_ssa(b []byte) bool {
 	return true
 }
 
-func testEmptyRange() {
+func testEmptyRange(t *testing.T) {
 	if !emptyRange_ssa([]byte{}) {
-		println("emptyRange_ssa([]byte{})=false, want true")
-		failed = true
+		t.Errorf("emptyRange_ssa([]byte{})=false, want true")
 	}
 }
 
@@ -97,20 +95,18 @@ func fallthrough_ssa(a int) int {
 
 }
 
-func testFallthrough() {
+func testFallthrough(t *testing.T) {
 	for i := 0; i < 6; i++ {
 		if got := fallthrough_ssa(i); got != i {
-			println("fallthrough_ssa(i) =", got, "wanted", i)
-			failed = true
+			t.Errorf("fallthrough_ssa(i) = %d, wanted %d", got, i)
 		}
 	}
 }
 
-func testSwitch() {
+func testSwitch(t *testing.T) {
 	for i := 0; i < 6; i++ {
 		if got := switch_ssa(i); got != i {
-			println("switch_ssa(i) =", got, "wanted", i)
-			failed = true
+			t.Errorf("switch_ssa(i) = %d, wanted %d", got, i)
 		}
 	}
 }
@@ -135,26 +131,19 @@ func flagOverwrite_ssa(s *junk, c int) int {
 	return 3
 }
 
-func testFlagOverwrite() {
+func testFlagOverwrite(t *testing.T) {
 	j := junk{}
 	if got := flagOverwrite_ssa(&j, ' '); got != 3 {
-		println("flagOverwrite_ssa =", got, "wanted 3")
-		failed = true
+		t.Errorf("flagOverwrite_ssa = %d, wanted 3", got)
 	}
 }
 
-var failed = false
-
-func main() {
-	testPhiControl()
-	testEmptyRange()
+func TestCtl(t *testing.T) {
+	testPhiControl(t)
+	testEmptyRange(t)
 
-	testSwitch()
-	testFallthrough()
+	testSwitch(t)
+	testFallthrough(t)
 
-	testFlagOverwrite()
-
-	if failed {
-		panic("failed")
-	}
+	testFlagOverwrite(t)
 }

src/cmd/compile/internal/gc/testdata/deferNoReturn.go renamed to src/cmd/compile/internal/gc/testdata/deferNoReturn_test.go

@@ -1,17 +1,21 @@
-// compile
-
 // 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 that a defer in a function with no return
 // statement will compile correctly.
 
-package foo
+package main
+
+import "testing"
 
 func deferNoReturn_ssa() {
 	defer func() { println("returned") }()
 	for {
 		println("loop")
 	}
 }
+
+func TestDeferNoReturn(t *testing.T) {
+	// This is a compile-time test, no runtime testing required.
+}