1
0
mirror of https://github.com/golang/go synced 2024-11-23 21:50:08 -07:00

cmd/go: populate the Module field for test packages

Fixes #39974

Change-Id: I52bb13e887fde52bf789198059c39fd6aacd96f0
Reviewed-on: https://go-review.googlesource.com/c/go/+/240678
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
This commit is contained in:
Bryan C. Mills 2020-07-01 10:33:56 -04:00
parent fb5c3eabd1
commit bb998747d6
2 changed files with 16 additions and 0 deletions

View File

@ -191,6 +191,7 @@ func TestPackagesAndErrors(ctx context.Context, p *Package, cover *TestCover) (p
GoFiles: p.XTestGoFiles,
Imports: p.XTestImports,
ForTest: p.ImportPath,
Module: p.Module,
Error: pxtestErr,
},
Internal: PackageInternal{
@ -222,6 +223,7 @@ func TestPackagesAndErrors(ctx context.Context, p *Package, cover *TestCover) (p
ImportPath: p.ImportPath + ".test",
Root: p.Root,
Imports: str.StringList(TestMainDeps),
Module: p.Module,
},
Internal: PackageInternal{
Build: &build.Package{Name: "main"},

View File

@ -3,9 +3,19 @@ env GO111MODULE=on
# go list -compiled -test must handle test-only packages
# golang.org/issue/27097.
go list -compiled -test
stdout -count=4 '^.' # 4 lines
stdout '^m$'
stdout '^m\.test$'
stdout '^m \[m\.test\]$'
stdout '^m_test \[m\.test\]$'
# https://golang.org/issue/39974: test packages should have the Module field populated.
go list -test -f '{{.ImportPath}}{{with .Module}}: {{.Path}}{{end}}'
stdout -count=4 '^.' # 4 lines
stdout '^m: m$'
stdout '^m\.test: m$'
stdout '^m \[m\.test\]: m$'
stdout '^m_test \[m\.test\]: m$'
-- go.mod --
module m
@ -14,3 +24,7 @@ module m
package x
import "testing"
func Test(t *testing.T) {}
-- x_x_test.go --
package x_test
import "testing"
func Test(t *testing.T) {}