From: Icarus Sparry <golang@icarus.freeuk.com>
Date: Tue, 26 Jan 2010 21:15:59 +0000 (-0800)
Subject: gotest still assumes that gopack is in your PATH
X-Git-Tag: weekly.2010-01-27~22
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7c1841fb2a5668ce560a8f0ff1253bfb2e70def7;p=gostls13.git

gotest still assumes that gopack is in your PATH

If your $PATH does not include $GOBIN then
the build fails at the first *.a file, which
is probably when running the tests for tar

R=rsc
CC=golang-dev
https://golang.org/cl/193066
---

diff --git a/src/cmd/gotest/gotest b/src/cmd/gotest/gotest
index b975513095..e6e9f16f5f 100755
--- a/src/cmd/gotest/gotest
+++ b/src/cmd/gotest/gotest
@@ -119,7 +119,7 @@ nmgrep() {
 		# Figure out pkg.
 		case "$i" in
 		*.a)
-			pkg=$(gopack p $i __.PKGDEF | sed -n 's/^package //p' | sed 1q)
+			pkg=$("$GOBIN"/gopack p $i __.PKGDEF | sed -n 's/^package //p' | sed 1q)
 			;;
 		*)
 			pkg=$(sed -n 's/^ .* in package "\(.*\)".*/\1/p' $i | sed 1q)