Skip to content

Commit d2b0311

Browse files
committed
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 <[email protected]> Run-TryBot: Robert Findley <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Robert Griesemer <[email protected]>
1 parent 9524e93 commit d2b0311

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ func TestStdKen(t *testing.T) {
204204
// Package paths of excluded packages.
205205
var excluded = map[string]bool{
206206
"builtin": true,
207+
208+
// See #46027: some imports are missing for this submodule.
209+
"crypto/ed25519/internal/edwards25519/field/_asm": true,
207210
}
208211

209212
// typecheck typechecks the given package files.
@@ -301,13 +304,6 @@ func (w *walker) walk(dir string) {
301304
return
302305
}
303306

304-
// skip submodules, which might not be vendored
305-
for _, f := range files {
306-
if f.Name() == "go.mod" {
307-
return
308-
}
309-
}
310-
311307
// apply pkgh to the files in directory dir
312308
// but ignore files directly under $GOROOT/src (might be temporary test files).
313309
if dir != filepath.Join(runtime.GOROOT(), "src") {

src/go/types/stdlib_test.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ func TestStdKen(t *testing.T) {
200200
// Package paths of excluded packages.
201201
var excluded = map[string]bool{
202202
"builtin": true,
203+
204+
// See #46027: some imports are missing for this submodule.
205+
"crypto/ed25519/internal/edwards25519/field/_asm": true,
203206
}
204207

205208
// typecheck typechecks the given package files.
@@ -306,13 +309,6 @@ func (w *walker) walk(dir string) {
306309
return
307310
}
308311

309-
// skip submodules, which might not be vendored
310-
for _, f := range files {
311-
if f.Name() == "go.mod" {
312-
return
313-
}
314-
}
315-
316312
// apply pkgh to the files in directory dir
317313
// but ignore files directly under $GOROOT/src (might be temporary test files).
318314
if dir != filepath.Join(runtime.GOROOT(), "src") {

0 commit comments

Comments
 (0)