diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2016-04-05 11:31:50 +1000 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2016-04-08 05:21:19 +0000 |
| commit | 6f643ce13f68c0b315801080e7602c9976ba790c (patch) | |
| tree | 97631f6254c7f843a8e71f2a4abb9e75673f9aab | |
| parent | 16c42047effe28edd5a827bec4b198ffc83f5ec8 (diff) | |
| download | go-6f643ce13f68c0b315801080e7602c9976ba790c.tar.gz go-6f643ce13f68c0b315801080e7602c9976ba790c.zip | |
runtime: leave directory before removing it in TestDLLPreloadMitigation
Fixes #15120
Change-Id: I1d9a192ac163826bad8b46e8c0b0b9e218e69570
Reviewed-on: https://go-review.googlesource.com/21520
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-on: https://go-review.googlesource.com/21698
Run-TryBot: Andrew Gerrand <adg@golang.org>
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
| -rw-r--r-- | src/runtime/syscall_windows_test.go | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go index 3f350cec27..7c82caafd8 100644 --- a/src/runtime/syscall_windows_test.go +++ b/src/runtime/syscall_windows_test.go @@ -780,6 +780,17 @@ func TestDLLPreloadMitigation(t *testing.T) { t.Skip("skipping test: gcc is missing") } + tmpdir, err := ioutil.TempDir("", "TestDLLPreloadMitigation") + if err != nil { + t.Fatal("TempDir failed: ", err) + } + defer func() { + err := os.RemoveAll(tmpdir) + if err != nil { + t.Error(err) + } + }() + dir0, err := os.Getwd() if err != nil { t.Fatal(err) @@ -794,12 +805,6 @@ uintptr_t cfunc() { SetLastError(123); } ` - tmpdir, err := ioutil.TempDir("", "TestDLLPreloadMitigation") - if err != nil { - t.Fatal("TempDir failed: ", err) - } - defer os.RemoveAll(tmpdir) - srcname := "nojack.c" err = ioutil.WriteFile(filepath.Join(tmpdir, srcname), []byte(src), 0) if err != nil { |