From: Alex Brainman <alex.brainman@gmail.com>
Date: Tue, 5 Apr 2016 04:10:22 +0000 (+1000)
Subject: cmd/go: leave directory before removing it in TestSharedLibName
X-Git-Tag: go1.7beta1~905
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=bbbd572c10e8e28d343a559b9c0ceef9074c719c;p=gostls13.git

cmd/go: leave directory before removing it in TestSharedLibName

Fixes #15124

Change-Id: I55fe4c2957370f3fb417c3df54f99fb085a5dada
Reviewed-on: https://go-review.googlesource.com/21522
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/go/pkg_test.go b/src/cmd/go/pkg_test.go
index 79479c2af5..fba13636cd 100644
--- a/src/cmd/go/pkg_test.go
+++ b/src/cmd/go/pkg_test.go
@@ -161,9 +161,12 @@ func TestSharedLibName(t *testing.T) {
 				}
 				oldGopath := buildContext.GOPATH
 				defer func() {
-					os.RemoveAll(tmpGopath)
 					buildContext.GOPATH = oldGopath
 					os.Chdir(cwd)
+					err := os.RemoveAll(tmpGopath)
+					if err != nil {
+						t.Error(err)
+					}
 				}()
 				root := filepath.Join(tmpGopath, "src", data.rootedAt)
 				err = os.MkdirAll(root, 0755)