qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 04:30:03 -07:00
Code Releases Activity

cmd/go: diagnose trivial test import cycle

Browse Source 
Was detecting only non-trivial ones.

Fixes #9690.

Change-Id: I662d81dd4818ddf29592057c090805772c84287b
Reviewed-on: https://go-review.googlesource.com/12147
Reviewed-by: Rob Pike <r@golang.org>
This commit is contained in:
Russ Cox 2015-07-13 22:39:17 -04:00
parent ea918ef535
commit 023047d14b
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmd/go/go_test.go
View File

@ -1848,6 +1848,9 @@ func TestGoTestDetectsTestOnlyImportCycles(t *testing.T) {
tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata")) tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata"))
tg.runFail("test", "-c", "testcycle/p3") tg.runFail("test", "-c", "testcycle/p3")
tg.grepStderr("import cycle not allowed in test", "go test testcycle/p3 produced unexpected error") tg.grepStderr("import cycle not allowed in test", "go test testcycle/p3 produced unexpected error")
tg.runFail("test", "-c", "testcycle/q1")
tg.grepStderr("import cycle not allowed in test", "go test testcycle/q1 produced unexpected error")
} }
func TestGoTestFooTestWorks(t *testing.T) { func TestGoTestFooTestWorks(t *testing.T) {

2
src/cmd/go/test.go
View File

@ -578,7 +578,7 @@ func (b *builder) test(p *Package) (buildAction, runAction, printAction *action,
if p1.Error != nil { if p1.Error != nil {
return nil, nil, nil, p1.Error return nil, nil, nil, p1.Error
} }
if contains(p1.Deps, p.ImportPath) { if contains(p1.Deps, p.ImportPath) || p1.ImportPath == p.ImportPath {
// Same error that loadPackage returns (via reusePackage) in pkg.go. // Same error that loadPackage returns (via reusePackage) in pkg.go.
// Can't change that code, because that code is only for loading the // Can't change that code, because that code is only for loading the
// non-test copy of a package. // non-test copy of a package.

1
src/cmd/go/testdata/src/testcycle/q1/q1.go vendored Normal file
View File

@ -0,0 +1 @@
package q1

6
src/cmd/go/testdata/src/testcycle/q1/q1_test.go vendored Normal file
View File

@ -0,0 +1,6 @@
package q1
import "testing"
import _ "testcycle/q1"
func Test(t *testing.T) {}