From 6b22572e700235fb7303c7fd6aefcc33c743a130 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 19 Oct 2022 11:57:15 -0400 Subject: [PATCH] go/internal/gcimporter,cmd/compile/internal/importer: skip tests that need 'go list' on js/wasm js/wasm doesn't support os.Exec, so it can't run 'go list' to locate export data for packages in the standard library. This fixes js/wasm test failures introduced in CL 442303. For #47257. Change-Id: I39289f376691493aa6fb447b3329f6508ab48d58 Reviewed-on: https://go-review.googlesource.com/c/go/+/444015 Auto-Submit: Bryan Mills Reviewed-by: David Chase Run-TryBot: Bryan Mills TryBot-Result: Gopher Robot --- src/cmd/compile/internal/importer/gcimporter_test.go | 6 ++++++ src/go/internal/gcimporter/gcimporter_test.go | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/cmd/compile/internal/importer/gcimporter_test.go b/src/cmd/compile/internal/importer/gcimporter_test.go index ac502e6e37..988d7daa25 100644 --- a/src/cmd/compile/internal/importer/gcimporter_test.go +++ b/src/cmd/compile/internal/importer/gcimporter_test.go @@ -30,6 +30,10 @@ func TestMain(m *testing.M) { // builders (build.golang.org) don't have access to compiled packages for // import. func skipSpecialPlatforms(t *testing.T) { + t.Helper() + testenv.MustHaveGoBuild(t) + + // TODO(bcmills): Is this still accurate now that ios is its own GOOS? switch platform := runtime.GOOS + "-" + runtime.GOARCH; platform { case "darwin-arm64": t.Skipf("no compiled packages available for import on %s", platform) @@ -120,6 +124,8 @@ func TestImportTestdata(t *testing.T) { t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler) } + skipSpecialPlatforms(t) + testfiles := map[string][]string{ "exports.go": {"go/ast", "go/token"}, "generics.go": nil, diff --git a/src/go/internal/gcimporter/gcimporter_test.go b/src/go/internal/gcimporter/gcimporter_test.go index de6a791dc8..7fa698d7c1 100644 --- a/src/go/internal/gcimporter/gcimporter_test.go +++ b/src/go/internal/gcimporter/gcimporter_test.go @@ -37,6 +37,9 @@ func TestMain(m *testing.M) { // builders (build.golang.org) don't have access to compiled packages for // import. func skipSpecialPlatforms(t *testing.T) { + t.Helper() + testenv.MustHaveGoBuild(t) + switch platform := runtime.GOOS + "-" + runtime.GOARCH; platform { case "darwin-arm64": t.Skipf("no compiled packages available for import on %s", platform) @@ -130,6 +133,8 @@ func TestImportTestdata(t *testing.T) { t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler) } + skipSpecialPlatforms(t) + testfiles := map[string][]string{ "exports.go": {"go/ast", "go/token"}, "generics.go": nil, @@ -168,6 +173,8 @@ func TestImportTypeparamTests(t *testing.T) { t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler) } + skipSpecialPlatforms(t) + tmpdir := mktmpdir(t) defer os.RemoveAll(tmpdir) -- 2.50.0