cmd/internal/moddeps: fix test fail when the last element of GOROOT start with a...

Fixes #54221

Change-Id: Id16f553251daf0b7c51f45232a4133f7dfb1ebb9
GitHub-Last-Rev: 675c2bfcbb4fd31da0442dd0e612874934cc0d87
GitHub-Pull-Request: golang/go#65298
Reviewed-on: https://go-review.googlesource.com/c/go/+/558696
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>

diff --git a/src/cmd/internal/moddeps/moddeps_test.go b/src/cmd/internal/moddeps/moddeps_test.go
index 3d4c99eecb46baee7c87a18601c7717f17318670..f9693a49545427eb07c3226da6963dbd3e2174a1 100644 (file)
--- a/src/cmd/internal/moddeps/moddeps_test.go
+++ b/src/cmd/internal/moddeps/moddeps_test.go
@@ -454,7 +454,7 @@ func findGorootModules(t *testing.T) []gorootModule {
                        if err != nil {
                                return err
                        }
-                       if info.IsDir() && (info.Name() == "vendor" || info.Name() == "testdata") {
+                       if info.IsDir() && path != root && (info.Name() == "vendor" || info.Name() == "testdata") {
                                return filepath.SkipDir
                        }
                        if info.IsDir() && path == filepath.Join(testenv.GOROOT(t), "pkg") {
@@ -465,7 +465,7 @@ func findGorootModules(t *testing.T) []gorootModule {
                                // running time of this test anyway.)
                                return filepath.SkipDir
                        }
-                       if info.IsDir() && (strings.HasPrefix(info.Name(), "_") || strings.HasPrefix(info.Name(), ".")) {
+                       if info.IsDir() && path != root && (strings.HasPrefix(info.Name(), "_") || strings.HasPrefix(info.Name(), ".")) {
                                // _ and . prefixed directories can be used for internal modules
                                // without a vendor directory that don't contribute to the build
                                // but might be used for example as code generators.