From 9dc2b714a0fcefe426bc2c9dd9ec0894bed5a5bf Mon Sep 17 00:00:00 2001 From: suzmue Date: Mon, 3 Jul 2017 22:29:01 -0400 Subject: [PATCH] cmd/gorename: add tests that run successfully Set the env variable to only include the correct gopath in the test. Fixes golang/go#20805 Change-Id: I496ed5c60278e508016f915cf53a115cc3c222ae Reviewed-on: https://go-review.googlesource.com/47410 Reviewed-by: Alan Donovan --- cmd/gorename/gorename_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/gorename/gorename_test.go b/cmd/gorename/gorename_test.go index a8dc24d5..e598b342 100644 --- a/cmd/gorename/gorename_test.go +++ b/cmd/gorename/gorename_test.go @@ -32,7 +32,13 @@ func TestGeneratedFiles(t *testing.T) { t.Fatal(err) } - env := append(os.Environ(), fmt.Sprintf("GOPATH=%s", tmp)) + var env = []string{fmt.Sprintf("GOPATH=%s", tmp)} + for _, envVar := range os.Environ() { + if !strings.HasPrefix(envVar, "GOPATH=") { + env = append(env, envVar) + } + } + // Testing renaming in packages that include cgo files: for iter, renameTest := range []test{ {