Skip to content

Commit 7c1aa5d

Browse files
alexandeargopherbot
authored andcommitted
cmd/compile: replace os.MkdirTemp with T.TempDir
Updates #45402 Change-Id: Ieffd1c8b0b5e4e63024b5be2e1f910fb4411eb94 GitHub-Last-Rev: fa7418c GitHub-Pull-Request: #57940 Reviewed-on: https://go-review.googlesource.com/c/go/+/462896 Reviewed-by: Bryan Mills <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Auto-Submit: Keith Randall <[email protected]> Reviewed-by: Keith Randall <[email protected]> Reviewed-by: Daniel Martí <[email protected]> Reviewed-by: Keith Randall <[email protected]> Run-TryBot: Keith Randall <[email protected]>
1 parent af2952a commit 7c1aa5d

File tree

11 files changed

+17
-90
lines changed

11 files changed

+17
-90
lines changed

src/cmd/compile/internal/dwarfgen/scope_test.go

+2-14
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,7 @@ func TestScopeRanges(t *testing.T) {
219219
t.Skip("skipping on plan9; no DWARF symbol table in executables")
220220
}
221221

222-
dir, err := os.MkdirTemp("", "TestScopeRanges")
223-
if err != nil {
224-
t.Fatalf("could not create directory: %v", err)
225-
}
226-
defer os.RemoveAll(dir)
227-
228-
src, f := gobuild(t, dir, false, testfile)
222+
src, f := gobuild(t, t.TempDir(), false, testfile)
229223
defer f.Close()
230224

231225
// the compiler uses forward slashes for paths even on windows
@@ -496,13 +490,7 @@ func TestEmptyDwarfRanges(t *testing.T) {
496490
t.Skip("skipping on plan9; no DWARF symbol table in executables")
497491
}
498492

499-
dir, err := os.MkdirTemp("", "TestEmptyDwarfRanges")
500-
if err != nil {
501-
t.Fatalf("could not create directory: %v", err)
502-
}
503-
defer os.RemoveAll(dir)
504-
505-
_, f := gobuild(t, dir, true, []testline{{line: "package main"}, {line: "func main(){ println(\"hello\") }"}})
493+
_, f := gobuild(t, t.TempDir(), true, []testline{{line: "package main"}, {line: "func main(){ println(\"hello\") }"}})
506494
defer f.Close()
507495

508496
dwarfData, err := f.DWARF()

src/cmd/compile/internal/importer/gcimporter_test.go

+1-10
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,8 @@ func testPath(t *testing.T, path, srcDir string) *types2.Package {
7474
}
7575

7676
func mktmpdir(t *testing.T) string {
77-
tmpdir, err := os.MkdirTemp("", "gcimporter_test")
78-
if err != nil {
79-
t.Fatal("mktmpdir:", err)
80-
}
77+
tmpdir := t.TempDir()
8178
if err := os.Mkdir(filepath.Join(tmpdir, "testdata"), 0700); err != nil {
82-
os.RemoveAll(tmpdir)
8379
t.Fatal("mktmpdir:", err)
8480
}
8581
return tmpdir
@@ -106,7 +102,6 @@ func TestImportTestdata(t *testing.T) {
106102

107103
for testfile, wantImports := range testfiles {
108104
tmpdir := mktmpdir(t)
109-
defer os.RemoveAll(tmpdir)
110105

111106
importMap := map[string]string{}
112107
for _, pkg := range wantImports {
@@ -149,7 +144,6 @@ func TestVersionHandling(t *testing.T) {
149144
}
150145

151146
tmpdir := mktmpdir(t)
152-
defer os.RemoveAll(tmpdir)
153147
corruptdir := filepath.Join(tmpdir, "testdata", "versions")
154148
if err := os.Mkdir(corruptdir, 0700); err != nil {
155149
t.Fatal(err)
@@ -439,7 +433,6 @@ func TestIssue13566(t *testing.T) {
439433
}
440434

441435
tmpdir := mktmpdir(t)
442-
defer os.RemoveAll(tmpdir)
443436
testoutdir := filepath.Join(tmpdir, "testdata")
444437

445438
// b.go needs to be compiled from the output directory so that the compiler can
@@ -530,7 +523,6 @@ func TestIssue15517(t *testing.T) {
530523
}
531524

532525
tmpdir := mktmpdir(t)
533-
defer os.RemoveAll(tmpdir)
534526

535527
compile(t, "testdata", "p.go", filepath.Join(tmpdir, "testdata"), nil)
536528

@@ -638,7 +630,6 @@ func importPkg(t *testing.T, path, srcDir string) *types2.Package {
638630
func compileAndImportPkg(t *testing.T, name string) *types2.Package {
639631
t.Helper()
640632
tmpdir := mktmpdir(t)
641-
defer os.RemoveAll(tmpdir)
642633
compile(t, "testdata", name+".go", filepath.Join(tmpdir, "testdata"), nil)
643634
return importPkg(t, "./testdata/"+name, tmpdir)
644635
}

src/cmd/compile/internal/logopt/logopt_test.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,7 @@ func TestLogOpt(t *testing.T) {
8686

8787
testenv.MustHaveGoBuild(t)
8888

89-
dir, err := os.MkdirTemp("", "TestLogOpt")
90-
if err != nil {
91-
t.Fatal(err)
92-
}
93-
defer os.RemoveAll(dir)
94-
95-
dir = fixSlash(dir) // Normalize the directory name as much as possible, for Windows testing
89+
dir := fixSlash(t.TempDir()) // Normalize the directory name as much as possible, for Windows testing
9690
src := filepath.Join(dir, "file.go")
9791
if err := os.WriteFile(src, []byte(srcCode), 0644); err != nil {
9892
t.Fatal(err)

src/cmd/compile/internal/ssa/debug_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -222,15 +222,11 @@ func testNexting(t *testing.T, base, tag, gcflags string, count int, moreArgs ..
222222

223223
// Use a temporary directory unless -f is specified
224224
if !*force {
225-
tmpdir, err := os.MkdirTemp("", "debug_test")
226-
if err != nil {
227-
panic(fmt.Sprintf("Problem creating TempDir, error %v\n", err))
228-
}
225+
tmpdir := t.TempDir()
229226
tmpbase = filepath.Join(tmpdir, "test-"+base+"."+tag)
230227
if *verbose {
231228
fmt.Printf("Tempdir is %s\n", tmpdir)
232229
}
233-
defer os.RemoveAll(tmpdir)
234230
}
235231
exe := tmpbase
236232

src/cmd/compile/internal/ssa/fmahash_test.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package ssa_test
66

77
import (
88
"internal/testenv"
9-
"os"
109
"path/filepath"
1110
"regexp"
1211
"runtime"
@@ -31,11 +30,7 @@ func TestFmaHash(t *testing.T) {
3130

3231
testenv.MustHaveGoBuild(t)
3332
gocmd := testenv.GoToolPath(t)
34-
tmpdir, err := os.MkdirTemp("", "x")
35-
if err != nil {
36-
t.Error(err)
37-
}
38-
defer os.RemoveAll(tmpdir)
33+
tmpdir := t.TempDir()
3934
source := filepath.Join("testdata", "fma.go")
4035
output := filepath.Join(tmpdir, "fma.exe")
4136
cmd := testenv.Command(t, gocmd, "build", "-o", output, source)

src/cmd/compile/internal/test/fixedbugs_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,10 @@ func TestIssue15854b(t *testing.T) {
5858
// Test that the generated assembly has line numbers (Issue #16214).
5959
func TestIssue16214(t *testing.T) {
6060
testenv.MustHaveGoBuild(t)
61-
dir, err := os.MkdirTemp("", "TestLineNumber")
62-
if err != nil {
63-
t.Fatalf("could not create directory: %v", err)
64-
}
65-
defer os.RemoveAll(dir)
61+
dir := t.TempDir()
6662

6763
src := filepath.Join(dir, "x.go")
68-
err = os.WriteFile(src, []byte(issue16214src), 0644)
64+
err := os.WriteFile(src, []byte(issue16214src), 0644)
6965
if err != nil {
7066
t.Fatalf("could not write file: %v", err)
7167
}

src/cmd/compile/internal/test/global_test.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ func TestScanfRemoval(t *testing.T) {
2020
t.Parallel()
2121

2222
// Make a directory to work in.
23-
dir, err := os.MkdirTemp("", "issue6853a-")
24-
if err != nil {
25-
t.Fatalf("could not create directory: %v", err)
26-
}
27-
defer os.RemoveAll(dir)
23+
dir := t.TempDir()
2824

2925
// Create source.
3026
src := filepath.Join(dir, "test.go")
@@ -68,11 +64,7 @@ func TestDashS(t *testing.T) {
6864
t.Parallel()
6965

7066
// Make a directory to work in.
71-
dir, err := os.MkdirTemp("", "issue14515-")
72-
if err != nil {
73-
t.Fatalf("could not create directory: %v", err)
74-
}
75-
defer os.RemoveAll(dir)
67+
dir := t.TempDir()
7668

7769
// Create source.
7870
src := filepath.Join(dir, "test.go")

src/cmd/compile/internal/test/inst_test.go

+2-9
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@ func TestInst(t *testing.T) {
1818
testenv.MustHaveGoBuild(t)
1919
testenv.MustHaveGoRun(t)
2020

21-
var tmpdir string
22-
var err error
23-
tmpdir, err = os.MkdirTemp("", "TestDict")
24-
if err != nil {
25-
t.Fatalf("Failed to create temporary directory: %v", err)
26-
}
27-
defer os.RemoveAll(tmpdir)
28-
2921
// Build ptrsort.go, which uses package mysort.
3022
var output []byte
23+
var err error
3124
filename := "ptrsort.go"
3225
exename := "ptrsort"
3326
outname := "ptrsort.out"
3427
gotool := testenv.GoToolPath(t)
35-
dest := filepath.Join(tmpdir, exename)
28+
dest := filepath.Join(t.TempDir(), exename)
3629
cmd := testenv.Command(t, gotool, "build", "-o", dest, filepath.Join("testdata", filename))
3730
if output, err = cmd.CombinedOutput(); err != nil {
3831
t.Fatalf("Failed: %v:\nOutput: %s\n", err, output)

src/cmd/compile/internal/test/lang_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ func TestInvalidLang(t *testing.T) {
2222

2323
testenv.MustHaveGoBuild(t)
2424

25-
dir, err := os.MkdirTemp("", "TestInvalidLang")
26-
if err != nil {
27-
t.Fatal(err)
28-
}
29-
defer os.RemoveAll(dir)
25+
dir := t.TempDir()
3026

3127
src := filepath.Join(dir, "alias.go")
3228
if err := os.WriteFile(src, []byte(aliasSrc), 0644); err != nil {

src/cmd/compile/internal/test/reproduciblebuilds_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,7 @@ func TestIssue38068(t *testing.T) {
7676
{tag: "serial", args: "-c=1"},
7777
{tag: "concurrent", args: "-c=2"}}
7878

79-
tmpdir, err := os.MkdirTemp("", "TestIssue38068")
80-
if err != nil {
81-
t.Fatal(err)
82-
}
83-
defer os.RemoveAll(tmpdir)
79+
tmpdir := t.TempDir()
8480

8581
src := filepath.Join("testdata", "reproducible", "issue38068.go")
8682
for i := range scenarios {

src/cmd/compile/internal/test/ssa_test.go

+3-13
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,8 @@ func runGenTest(t *testing.T, filename, tmpname string, ev ...string) {
3333
t.Fatalf("Failed: %v:\nOut: %s\nStderr: %s\n", err, &stdout, &stderr)
3434
}
3535
// Write stdout into a temporary file
36-
tmpdir, ok := os.MkdirTemp("", tmpname)
37-
if ok != nil {
38-
t.Fatalf("Failed to create temporary directory")
39-
}
40-
defer os.RemoveAll(tmpdir)
41-
42-
rungo := filepath.Join(tmpdir, "run.go")
43-
ok = os.WriteFile(rungo, stdout.Bytes(), 0600)
36+
rungo := filepath.Join(t.TempDir(), "run.go")
37+
ok := os.WriteFile(rungo, stdout.Bytes(), 0600)
4438
if ok != nil {
4539
t.Fatalf("Failed to create temporary file " + rungo)
4640
}
@@ -79,11 +73,7 @@ func TestCode(t *testing.T) {
7973
gotool := testenv.GoToolPath(t)
8074

8175
// Make a temporary directory to work in.
82-
tmpdir, err := os.MkdirTemp("", "TestCode")
83-
if err != nil {
84-
t.Fatalf("Failed to create temporary directory: %v", err)
85-
}
86-
defer os.RemoveAll(tmpdir)
76+
tmpdir := t.TempDir()
8777

8878
// Find all the test functions (and the files containing them).
8979
var srcs []string // files containing Test functions

0 commit comments

Comments
 (0)