diff options
| author | ianwoolf <btw515wolf2@gmail.com> | 2021-04-07 20:16:58 +0800 |
|---|---|---|
| committer | Emmanuel Odeke <emmanuel@orijtech.com> | 2021-04-08 07:33:58 +0000 |
| commit | a7e16abb22f1b249d2691b32a5d20206282898f2 (patch) | |
| tree | 68c912580165de3096390796f15234f4b8c8eae9 /src/runtime/syscall_windows_test.go | |
| parent | 2123dfba651e3522ed039d1b38fde91ededf47a3 (diff) | |
| download | go-a7e16abb22f1b249d2691b32a5d20206282898f2.tar.xz | |
runtime: replace os.MkdirTemp with T.TempDir
Updates #45402
Change-Id: I3aa82fc2486b4de49b45388bbab24f5ffe558f91
Reviewed-on: https://go-review.googlesource.com/c/go/+/307989
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Diffstat (limited to 'src/runtime/syscall_windows_test.go')
| -rw-r--r-- | src/runtime/syscall_windows_test.go | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/src/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go index 65ecb4fbf2..98e426a3d5 100644 --- a/src/runtime/syscall_windows_test.go +++ b/src/runtime/syscall_windows_test.go @@ -543,11 +543,7 @@ func TestStdcallAndCDeclCallbacks(t *testing.T) { if _, err := exec.LookPath("gcc"); err != nil { t.Skip("skipping test: gcc is missing") } - tmp, err := os.MkdirTemp("", "TestCDeclCallback") - if err != nil { - t.Fatal("TempDir failed: ", err) - } - defer os.RemoveAll(tmp) + tmp := t.TempDir() oldRegs := runtime.SetIntArgRegs(abi.IntArgRegs) defer runtime.SetIntArgRegs(oldRegs) @@ -702,14 +698,10 @@ uintptr_t cfunc(callback f, uintptr_t n) { return r; } ` - tmpdir, err := os.MkdirTemp("", "TestReturnAfterStackGrowInCallback") - if err != nil { - t.Fatal("TempDir failed: ", err) - } - defer os.RemoveAll(tmpdir) + tmpdir := t.TempDir() srcname := "mydll.c" - err = os.WriteFile(filepath.Join(tmpdir, srcname), []byte(src), 0) + err := os.WriteFile(filepath.Join(tmpdir, srcname), []byte(src), 0) if err != nil { t.Fatal(err) } @@ -771,14 +763,10 @@ uintptr_t cfunc(uintptr_t a, double b, float c, double d) { return 0; } ` - tmpdir, err := os.MkdirTemp("", "TestFloatArgs") - if err != nil { - t.Fatal("TempDir failed: ", err) - } - defer os.RemoveAll(tmpdir) + tmpdir := t.TempDir() srcname := "mydll.c" - err = os.WriteFile(filepath.Join(tmpdir, srcname), []byte(src), 0) + err := os.WriteFile(filepath.Join(tmpdir, srcname), []byte(src), 0) if err != nil { t.Fatal(err) } @@ -833,14 +821,10 @@ double cfuncDouble(uintptr_t a, double b, float c, double d) { return 0; } ` - tmpdir, err := os.MkdirTemp("", "TestFloatReturn") - if err != nil { - t.Fatal("TempDir failed: ", err) - } - defer os.RemoveAll(tmpdir) + tmpdir := t.TempDir() srcname := "mydll.c" - err = os.WriteFile(filepath.Join(tmpdir, srcname), []byte(src), 0) + err := os.WriteFile(filepath.Join(tmpdir, srcname), []byte(src), 0) if err != nil { t.Fatal(err) } @@ -1048,16 +1032,7 @@ func TestDLLPreloadMitigation(t *testing.T) { t.Skip("skipping test: gcc is missing") } - tmpdir, err := os.MkdirTemp("", "TestDLLPreloadMitigation") - if err != nil { - t.Fatal("TempDir failed: ", err) - } - defer func() { - err := os.RemoveAll(tmpdir) - if err != nil { - t.Error(err) - } - }() + tmpdir := t.TempDir() dir0, err := os.Getwd() if err != nil { @@ -1135,11 +1110,7 @@ func TestBigStackCallbackSyscall(t *testing.T) { t.Fatal("Abs failed: ", err) } - tmpdir, err := os.MkdirTemp("", "TestBigStackCallback") - if err != nil { - t.Fatal("TempDir failed: ", err) - } - defer os.RemoveAll(tmpdir) + tmpdir := t.TempDir() outname := "mydll.dll" cmd := exec.Command("gcc", "-shared", "-s", "-Werror", "-o", outname, srcname) @@ -1284,14 +1255,10 @@ func BenchmarkOsYield(b *testing.B) { } func BenchmarkRunningGoProgram(b *testing.B) { - tmpdir, err := os.MkdirTemp("", "BenchmarkRunningGoProgram") - if err != nil { - b.Fatal(err) - } - defer os.RemoveAll(tmpdir) + tmpdir := b.TempDir() src := filepath.Join(tmpdir, "main.go") - err = os.WriteFile(src, []byte(benchmarkRunningGoProgram), 0666) + err := os.WriteFile(src, []byte(benchmarkRunningGoProgram), 0666) if err != nil { b.Fatal(err) } |
