Skip to content

Commit 3145a2f

Browse files
Add tests for BuildInfo
1 parent fc51e50 commit 3145a2f

File tree

2 files changed

+521
-3
lines changed

2 files changed

+521
-3
lines changed

src/cmd/go/internal/load/pkg.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ type PackagePublic struct {
142142
XTestEmbedFiles []string `json:",omitempty"` // files matched by XTestEmbedPatterns
143143
}
144144

145+
var FromDir = vcs.FromDir
146+
145147
// AllFiles returns the names of all the files considered for the package.
146148
// This is used for sanity and security checks, so we include all files,
147149
// even IgnoredGoFiles, because some subcommands consider them.
@@ -2429,7 +2431,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
24292431
// (so the bootstrap toolchain packages don't even appear to be in GOROOT).
24302432
goto omitVCS
24312433
}
2432-
repoDir, vcsCmd, err = vcs.FromDir(base.Cwd(), "", allowNesting)
2434+
repoDir, vcsCmd, err = FromDir(base.Cwd(), "", allowNesting)
24332435
if err != nil && !errors.Is(err, os.ErrNotExist) {
24342436
setVCSError(err)
24352437
return
@@ -2455,7 +2457,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
24552457
// repository. vcs.FromDir allows nested Git repositories, but nesting
24562458
// is not allowed for other VCS tools. The current directory may be outside
24572459
// p.Module.Dir when a workspace is used.
2458-
pkgRepoDir, _, err := vcs.FromDir(p.Dir, "", allowNesting)
2460+
pkgRepoDir, _, err := FromDir(p.Dir, "", allowNesting)
24592461
if err != nil {
24602462
setVCSError(err)
24612463
return
@@ -2467,7 +2469,7 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
24672469
}
24682470
goto omitVCS
24692471
}
2470-
modRepoDir, _, err := vcs.FromDir(p.Module.Dir, "", allowNesting)
2472+
modRepoDir, _, err := FromDir(p.Module.Dir, "", allowNesting)
24712473
if err != nil {
24722474
setVCSError(err)
24732475
return

0 commit comments

Comments
 (0)