diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2016-04-05 11:31:50 +1000 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2016-04-05 04:32:49 +0000 |
| commit | ffeae198d018693f84b15f8f44f9a2eb6b8e9713 (patch) | |
| tree | 7608344c10ede54be9774f1719ca108e7aab8677 /src | |
| parent | c1c7547f6ad7264c1d6eea3fc1645b2eab104694 (diff) | |
| download | go-ffeae198d018693f84b15f8f44f9a2eb6b8e9713.tar.xz | |
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>
Diffstat (limited to 'src')
| -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 0b3ebe504d..ff045338c1 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 { |