From: Rob Findley <rfindley@google.com>
Date: Tue, 23 May 2023 16:37:13 +0000 (-0400)
Subject: go/types, types2: require CGO for TestIssue59944
X-Git-Tag: go1.21rc1~350
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e1e10e6ef44f83b64350ff301512472b03ad176c;p=gostls13.git

go/types, types2: require CGO for TestIssue59944

This test is failing on the nocgo builder.

Change-Id: I9426ce77907956e4654fd437ad20e3af664e83ab
Reviewed-on: https://go-review.googlesource.com/c/go/+/497436
Run-TryBot: Robert Findley <rfindley@google.com>
Reviewed-by: Robert Griesemer <gri@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
---

diff --git a/src/cmd/compile/internal/types2/issues_test.go b/src/cmd/compile/internal/types2/issues_test.go
index 6005587645..8bd42a5271 100644
--- a/src/cmd/compile/internal/types2/issues_test.go
+++ b/src/cmd/compile/internal/types2/issues_test.go
@@ -11,7 +11,6 @@ import (
 	"fmt"
 	"internal/testenv"
 	"regexp"
-	"runtime"
 	"sort"
 	"strings"
 	"testing"
@@ -807,11 +806,8 @@ func (S) M5(struct {S;t}) {}
 }
 
 func TestIssue59944(t *testing.T) {
-	if runtime.GOARCH == "wasm" {
-		// While we don't use the cgo tool directly in this test, we must have the
-		// syscall package.
-		t.Skip("cgo generated code does not compile on wasm")
-	}
+	testenv.MustHaveCGO(t)
+
 	// The typechecker should resolve methods declared on aliases of cgo types.
 	const src = `
 package p
diff --git a/src/go/types/issues_test.go b/src/go/types/issues_test.go
index d7f06cd9cb..1a784aae21 100644
--- a/src/go/types/issues_test.go
+++ b/src/go/types/issues_test.go
@@ -13,7 +13,6 @@ import (
 	"go/token"
 	"internal/testenv"
 	"regexp"
-	"runtime"
 	"sort"
 	"strings"
 	"testing"
@@ -846,11 +845,8 @@ func (S) M5(struct {S;t}) {}
 }
 
 func TestIssue59944(t *testing.T) {
-	if runtime.GOARCH == "wasm" {
-		// While we don't use the cgo tool directly in this test, we must have the
-		// syscall package.
-		t.Skip("cgo generated code does not compile on wasm")
-	}
+	testenv.MustHaveCGO(t)
+
 	// The typechecker should resolve methods declared on aliases of cgo types.
 	const src = `
 package p