aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIcarus Sparry <golang@icarus.freeuk.com>2010-01-26 13:15:59 -0800
committerRuss Cox <rsc@golang.org>2010-01-26 13:15:59 -0800
commit7c1841fb2a5668ce560a8f0ff1253bfb2e70def7 (patch)
tree90caf57ae53cc521c9d01eda4479e33642ad9144
parent2e688e1ba0af4c1830414807bce0788155985b64 (diff)
downloadgo-7c1841fb2a5668ce560a8f0ff1253bfb2e70def7.tar.gz
go-7c1841fb2a5668ce560a8f0ff1253bfb2e70def7.zip
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
-rwxr-xr-xsrc/cmd/gotest/gotest2
1 files changed, 1 insertions, 1 deletions
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)