From 6f643ce13f68c0b315801080e7602c9976ba790c Mon Sep 17 00:00:00 2001 From: Alex Brainman Date: Tue, 5 Apr 2016 11:31:50 +1000 Subject: 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 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-on: https://go-review.googlesource.com/21698 Run-TryBot: Andrew Gerrand Reviewed-by: Alex Brainman --- src/runtime/syscall_windows_test.go | 17 +++++++++++------ 1 file 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 { -- cgit v1.2.3-54-g00ecf