]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: leave directory before removing it in TestSharedLibName
authorAlex Brainman <alex.brainman@gmail.com>
Tue, 5 Apr 2016 04:10:22 +0000 (14:10 +1000)
committerAlex Brainman <alex.brainman@gmail.com>
Tue, 5 Apr 2016 04:45:47 +0000 (04:45 +0000)
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>

src/cmd/go/pkg_test.go

index 79479c2af5ef4529606cebe24d9597f22db942c2..fba13636cdd195bfd63a10840592d37c5287a638 100644 (file)
@@ -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)