From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 1 Mar 2019 21:25:44 +0000 (-0800)
Subject: go/internal/gccgoimporter: remove temporary directories in test
X-Git-Tag: go1.13beta1~1269
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=619cc9fa4152399dde89d2a4700ee737cae444e0;p=gostls13.git

go/internal/gccgoimporter: remove temporary directories in test

Updates #30500

Change-Id: I42716c2bfd7f087303bc63d7518e32b52fd0d762
Reviewed-on: https://go-review.googlesource.com/c/164862
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/go/internal/gccgoimporter/importer_test.go b/src/go/internal/gccgoimporter/importer_test.go
index 7a21c5f2f4..58fa8c8cf5 100644
--- a/src/go/internal/gccgoimporter/importer_test.go
+++ b/src/go/internal/gccgoimporter/importer_test.go
@@ -143,17 +143,21 @@ func TestObjImporter(t *testing.T) {
 	}
 	t.Logf("gccgo version %d.%d", major, minor)
 
-	tmpdir, err := ioutil.TempDir("", "")
+	tmpdir, err := ioutil.TempDir("", "TestObjImporter")
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer os.RemoveAll(tmpdir)
+
 	initmap := make(map[*types.Package]InitData)
 	imp := GetImporter([]string{tmpdir}, initmap)
 
-	artmpdir, err := ioutil.TempDir("", "")
+	artmpdir, err := ioutil.TempDir("", "TestObjImporter")
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer os.RemoveAll(artmpdir)
+
 	arinitmap := make(map[*types.Package]InitData)
 	arimp := GetImporter([]string{artmpdir}, arinitmap)
 
@@ -198,8 +202,4 @@ func TestObjImporter(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-
-	if err = os.Remove(tmpdir); err != nil {
-		t.Fatal(err)
-	}
 }