From: Bryan C. Mills <bcmills@google.com>
Date: Fri, 1 Mar 2019 13:40:40 +0000 (-0500)
Subject: misc/cgo/test: set PWD when executing 'go test' in an alternate GOPATH
X-Git-Tag: go1.13beta1~1276
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ee6bec958dcb701a3cfc46d85ad51d7dc97e5c1f;p=gostls13.git

misc/cgo/test: set PWD when executing 'go test' in an alternate GOPATH

That makes the test more friendly to the Android exec script, since it
won't have to evaluate symlinks to find the directory.

Change-Id: I06aae3224d489eed6d7fac7e462361f3bf1dd3da
Reviewed-on: https://go-review.googlesource.com/c/164624
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Elias Naur <mail@eliasnaur.com>
---

diff --git a/misc/cgo/test/pkg_test.go b/misc/cgo/test/pkg_test.go
index 76b0d586b2..08e075c022 100644
--- a/misc/cgo/test/pkg_test.go
+++ b/misc/cgo/test/pkg_test.go
@@ -59,7 +59,7 @@ func TestCrossPackageTests(t *testing.T) {
 		cmd.Args = append(cmd.Args, "-short")
 	}
 	cmd.Dir = modRoot
-	cmd.Env = append(os.Environ(), "GOPATH="+GOPATH)
+	cmd.Env = append(os.Environ(), "GOPATH="+GOPATH, "PWD="+cmd.Dir)
 	out, err := cmd.CombinedOutput()
 	if err == nil {
 		t.Logf("%s:\n%s", strings.Join(cmd.Args, " "), out)