@@ -74,12 +74,8 @@ func testPath(t *testing.T, path, srcDir string) *types2.Package {
74
74
}
75
75
76
76
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 ()
81
78
if err := os .Mkdir (filepath .Join (tmpdir , "testdata" ), 0700 ); err != nil {
82
- os .RemoveAll (tmpdir )
83
79
t .Fatal ("mktmpdir:" , err )
84
80
}
85
81
return tmpdir
@@ -106,7 +102,6 @@ func TestImportTestdata(t *testing.T) {
106
102
107
103
for testfile , wantImports := range testfiles {
108
104
tmpdir := mktmpdir (t )
109
- defer os .RemoveAll (tmpdir )
110
105
111
106
importMap := map [string ]string {}
112
107
for _ , pkg := range wantImports {
@@ -149,7 +144,6 @@ func TestVersionHandling(t *testing.T) {
149
144
}
150
145
151
146
tmpdir := mktmpdir (t )
152
- defer os .RemoveAll (tmpdir )
153
147
corruptdir := filepath .Join (tmpdir , "testdata" , "versions" )
154
148
if err := os .Mkdir (corruptdir , 0700 ); err != nil {
155
149
t .Fatal (err )
@@ -439,7 +433,6 @@ func TestIssue13566(t *testing.T) {
439
433
}
440
434
441
435
tmpdir := mktmpdir (t )
442
- defer os .RemoveAll (tmpdir )
443
436
testoutdir := filepath .Join (tmpdir , "testdata" )
444
437
445
438
// b.go needs to be compiled from the output directory so that the compiler can
@@ -530,7 +523,6 @@ func TestIssue15517(t *testing.T) {
530
523
}
531
524
532
525
tmpdir := mktmpdir (t )
533
- defer os .RemoveAll (tmpdir )
534
526
535
527
compile (t , "testdata" , "p.go" , filepath .Join (tmpdir , "testdata" ), nil )
536
528
@@ -638,7 +630,6 @@ func importPkg(t *testing.T, path, srcDir string) *types2.Package {
638
630
func compileAndImportPkg (t * testing.T , name string ) * types2.Package {
639
631
t .Helper ()
640
632
tmpdir := mktmpdir (t )
641
- defer os .RemoveAll (tmpdir )
642
633
compile (t , "testdata" , name + ".go" , filepath .Join (tmpdir , "testdata" ), nil )
643
634
return importPkg (t , "./testdata/" + name , tmpdir )
644
635
}
0 commit comments