]> Cypherpunks repositories - gostls13.git/commitdiff
go/internal/gccgoimporter: remove temporary directories in test
authorIan Lance Taylor <iant@golang.org>
Fri, 1 Mar 2019 21:25:44 +0000 (13:25 -0800)
committerIan Lance Taylor <iant@golang.org>
Fri, 1 Mar 2019 22:27:12 +0000 (22:27 +0000)
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>
src/go/internal/gccgoimporter/importer_test.go

index 7a21c5f2f484654f08c7eb72ed71d2b9eaca7862..58fa8c8cf5ccad8aeede19bc01e18c19b886ec31 100644 (file)
@@ -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)
-       }
 }