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/21681
Run-TryBot: Andrew Gerrand <adg@golang.org>
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>

diff --git a/src/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go
index ee449f93f7ca66fd08631d323762eeb37b0571b3..6a5e536b6a1b51f820a2072f08de49d5896322c3 100644 (file)
--- a/src/runtime/syscall_windows_test.go
+++ b/src/runtime/syscall_windows_test.go
@@ -649,6 +649,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)
@@ -663,12 +674,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 {