From: Russ Cox <rsc@golang.org>
Date: Tue, 30 Sep 2014 16:34:36 +0000 (-0400)
Subject: [release-branch.go1.3] nacltest.bash: unset GOROOT
X-Git-Tag: go1.3.3~3
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c09c8bb32595fc4b0bfcb1f6cedaf01040b05e1a;p=gostls13.git

[release-branch.go1.3] nacltest.bash: unset GOROOT

The GOROOT baked into the go command being run is correct.
The GOROOT in the environment may not be. Remove it.

Fixes nacltest.bash if you have GOROOT set elsewhere.

This is already fixed in the default branch.

LGTM=r
R=golang-codereviews, r
CC=bradfitz, golang-codereviews, iant
https://golang.org/cl/147380044
---

diff --git a/src/nacltest.bash b/src/nacltest.bash
index 33fc8c1c4e..e5bbb4b683 100755
--- a/src/nacltest.bash
+++ b/src/nacltest.bash
@@ -45,6 +45,7 @@ if [ ! -f make.bash ]; then
 	exit 1
 fi
 GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH ./make.bash
+unset GOROOT
 
 # Build zip file embedded in package syscall.
 gobin=${GOBIN:-$(pwd)/../bin}