From: Rob Findley <rfindley@google.com>
Date: Fri, 7 May 2021 00:36:10 +0000 (-0400)
Subject: go/types,cmd/compile/internal/types2: unskip std and cmd in TestStdlib
X-Git-Tag: go1.17beta1~213
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d2b03111c44db5808ef5248470bf95fe7ea35ebc;p=gostls13.git

go/types,cmd/compile/internal/types2: unskip std and cmd in TestStdlib

CL 276272 accidentally skipped everything in TestStdlib while trying to
skip nested submodules of std and cmd.

For now, narrow the skip to just the problematic submodule rather than
trying to generalize. We can re-evaluate if it becomes a pattern to
vendor submodules in this way.

Fixes #46027

Change-Id: Ib355ff80dfbf17c3cf37d128a2f48d4216305267
Reviewed-on: https://go-review.googlesource.com/c/go/+/317869
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
---

diff --git a/src/cmd/compile/internal/types2/stdlib_test.go b/src/cmd/compile/internal/types2/stdlib_test.go
index 7d6753e5c2..cde35c17b6 100644
--- a/src/cmd/compile/internal/types2/stdlib_test.go
+++ b/src/cmd/compile/internal/types2/stdlib_test.go
@@ -204,6 +204,9 @@ func TestStdKen(t *testing.T) {
 // Package paths of excluded packages.
 var excluded = map[string]bool{
 	"builtin": true,
+
+	// See #46027: some imports are missing for this submodule.
+	"crypto/ed25519/internal/edwards25519/field/_asm": true,
 }
 
 // typecheck typechecks the given package files.
@@ -301,13 +304,6 @@ func (w *walker) walk(dir string) {
 		return
 	}
 
-	// skip submodules, which might not be vendored
-	for _, f := range files {
-		if f.Name() == "go.mod" {
-			return
-		}
-	}
-
 	// apply pkgh to the files in directory dir
 	// but ignore files directly under $GOROOT/src (might be temporary test files).
 	if dir != filepath.Join(runtime.GOROOT(), "src") {
diff --git a/src/go/types/stdlib_test.go b/src/go/types/stdlib_test.go
index b565956e08..3dea8dcf1e 100644
--- a/src/go/types/stdlib_test.go
+++ b/src/go/types/stdlib_test.go
@@ -200,6 +200,9 @@ func TestStdKen(t *testing.T) {
 // Package paths of excluded packages.
 var excluded = map[string]bool{
 	"builtin": true,
+
+	// See #46027: some imports are missing for this submodule.
+	"crypto/ed25519/internal/edwards25519/field/_asm": true,
 }
 
 // typecheck typechecks the given package files.
@@ -306,13 +309,6 @@ func (w *walker) walk(dir string) {
 		return
 	}
 
-	// skip submodules, which might not be vendored
-	for _, f := range files {
-		if f.Name() == "go.mod" {
-			return
-		}
-	}
-
 	// apply pkgh to the files in directory dir
 	// but ignore files directly under $GOROOT/src (might be temporary test files).
 	if dir != filepath.Join(runtime.GOROOT(), "src") {