qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-05 15:46:11 -07:00
Code Releases Activity

cmd/go: fix link error for -coverpkg in GOPATH mode

Browse Source 
If a generated test main package transitively depends on a main
package, the main package will now always be rebuilt as a library and
will not be compiled with '-p main'.

This expands the fix for #30907, which only applied to packages with
the BuildInfo set (main packages built in module mode). Linking
multiple packages with BuildInfo caused link errors, but it appears
these errors apply to some symbols in GOPATH mode.

Fixes #34114

Change-Id: Ic1e53437942269a950dd7e45d163707922c92edd
Reviewed-on: https://go-review.googlesource.com/c/go/+/195279
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Jay Conrod 2019-09-13 11:10:36 -04:00
parent 79877e5f91
commit 24781a1faf
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmd/go/internal/load/test.go
View File

@ -399,10 +399,13 @@ func recompileForTest(pmain, preal, ptest, pxtest *Package) {
}
}
// Don't compile build info from a main package. This can happen
// if -coverpkg patterns include main packages, since those packages
// are imported by pmain. See golang.org/issue/30907.
if p.Internal.BuildInfo != "" && p != pmain {
// Force main packages the test imports to be built as libraries.
// Normal imports of main packages are forbidden by the package loader,
// but this can still happen if -coverpkg patterns include main packages:
// covered packages are imported by pmain. Linking multiple packages
// compiled with '-p main' causes duplicate symbol errors.
// See golang.org/issue/30907, golang.org/issue/34114.
if p.Name == "main" && p != pmain {
split()
}
}

21
src/cmd/go/testdata/script/cover_pkgall_multiple_mains.txt vendored
View File

@ -1,29 +1,32 @@
# This test checks that multiple main packages can be tested
# with -coverpkg=all without duplicate symbol errors.
# Verifies golang.org/issue/30374.
env GO111MODULE=on
# Verifies golang.org/issue/30374, golang.org/issue/34114.
[short] skip
cd $GOPATH/src/example.com/cov
env GO111MODULE=on
go test -coverpkg=all ./...
-- go.mod --
env GO111MODULE=off
go test -coverpkg=all ./...
-- $GOPATH/src/example.com/cov/go.mod --
module example.com/cov
-- mainonly/mainonly.go --
-- $GOPATH/src/example.com/cov/mainonly/mainonly.go --
package main
func main() {}
-- mainwithtest/mainwithtest.go --
-- $GOPATH/src/example.com/cov/mainwithtest/mainwithtest.go --
package main
func main() {}
func Foo() {}
-- mainwithtest/mainwithtest_test.go --
-- $GOPATH/src/example.com/cov/mainwithtest/mainwithtest_test.go --
package main
import "testing"
@ -32,10 +35,10 @@ func TestFoo(t *testing.T) {
Foo()
}
-- xtest/x.go --
-- $GOPATH/src/example.com/cov/xtest/x.go --
package x
-- xtest/x_test.go --
-- $GOPATH/src/example.com/cov/xtest/x_test.go --
package x_test
import "testing"