From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 21 Jul 2015 20:59:35 +0000 (-0700)
Subject: cmd/go: for get -t and list, look up path in vendor directories
X-Git-Tag: go1.5beta3~105
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a5caa7c94eda915ee5e5ff82d81a22b8392d84aa;p=gostls13.git

cmd/go: for get -t and list, look up path in vendor directories

This is needed to handle vendor directories correctly.  It was already
done for the regular imports when the package was loaded, but not for
the test-only imports.

It would be nice to do this while loading the package, but that breaks
the code that checks for direct references to vendor packages when
running go test.  This change is relatively contained.

While we're at it, skip "C" test imports in go get.

Fixes #11628.
Fixes #11717.

Change-Id: I9cc308cf45683e3ff905320c2b5cb45db7716846
Reviewed-on: https://go-review.googlesource.com/12488
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
---

diff --git a/src/cmd/go/get.go b/src/cmd/go/get.go
index 320698ec47..f331c298e2 100644
--- a/src/cmd/go/get.go
+++ b/src/cmd/go/get.go
@@ -287,10 +287,22 @@ func download(arg string, parent *Package, stk *importStack, getTestDeps bool) {
 		if getTestDeps {
 			// Process test dependencies when -t is specified.
 			// (Don't get test dependencies for test dependencies.)
+			//
+			// We apply vendoredImportPath here.  It's not
+			// needed for Imports, because it was done
+			// while loading the package.
 			for _, path := range p.TestImports {
+				if path == "C" {
+					continue
+				}
+				path, _ = vendoredImportPath(p, path)
 				download(path, p, stk, false)
 			}
 			for _, path := range p.XTestImports {
+				if path == "C" {
+					continue
+				}
+				path, _ = vendoredImportPath(p, path)
 				download(path, p, stk, false)
 			}
 		}
diff --git a/src/cmd/go/list.go b/src/cmd/go/list.go
index e500ece474..b24444026b 100644
--- a/src/cmd/go/list.go
+++ b/src/cmd/go/list.go
@@ -175,6 +175,18 @@ func runList(cmd *Command, args []string) {
 	}
 
 	for _, pkg := range load(args) {
+		// We apply vendoredImportPath here for test imports.
+		// It's not needed for regular imports, because it was
+		// done while loading the package.
+		for i, path := range pkg.TestImports {
+			path, _ = vendoredImportPath(pkg, path)
+			pkg.TestImports[i] = path
+		}
+		for i, path := range pkg.XTestImports {
+			path, _ = vendoredImportPath(pkg, path)
+			pkg.XTestImports[i] = path
+		}
+
 		do(pkg)
 	}
 }
diff --git a/src/cmd/go/vendor_test.go b/src/cmd/go/vendor_test.go
index 389fd5efb0..b99b4f1185 100644
--- a/src/cmd/go/vendor_test.go
+++ b/src/cmd/go/vendor_test.go
@@ -142,3 +142,34 @@ func splitLines(s string) []string {
 	}
 	return x
 }
+
+func TestVendorGet(t *testing.T) {
+	tg := testgo(t)
+	defer tg.cleanup()
+	tg.tempFile("src/v/m.go", `
+		package main
+		import ("fmt"; "vendor.org/p")
+		func main() {
+			fmt.Println(p.C)
+		}`)
+	tg.tempFile("src/v/m_test.go", `
+		package main
+		import ("fmt"; "testing"; "vendor.org/p")
+		func TestNothing(t *testing.T) {
+			fmt.Println(p.C)
+		}`)
+	tg.tempFile("src/v/vendor/vendor.org/p/p.go", `
+		package p
+		const C = 1`)
+	tg.setenv("GOPATH", tg.path("."))
+	tg.setenv("GO15VENDOREXPERIMENT", "1")
+	tg.cd(tg.path("src/v"))
+	tg.run("run", "m.go")
+	tg.run("test")
+	tg.run("list", "-f", "{{.Imports}}")
+	tg.grepStdout("v/vendor/vendor.org/p", "import not in vendor directory")
+	tg.run("list", "-f", "{{.TestImports}}")
+	tg.grepStdout("v/vendor/vendor.org/p", "test import not in vendor directory")
+	tg.run("get")
+	tg.run("get", "-t")
+}