Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / libgo / go / os / path_test.go

diff --git a/libgo/go/os/path_test.go b/libgo/go/os/path_test.go
index c1e3fb3..16c4120 100644 (file)
--- a/libgo/go/os/path_test.go
+++ b/libgo/go/os/path_test.go
@@ -5,6 +5,7 @@
 package os_test
 
 import (
+       "io/ioutil"
        . "os"
        "path/filepath"
        "runtime"
@@ -167,24 +168,26 @@ func TestRemoveAll(t *testing.T) {
 
 func TestMkdirAllWithSymlink(t *testing.T) {
        if runtime.GOOS == "windows" || runtime.GOOS == "plan9" {
-               t.Log("Skipping test: symlinks don't exist under Windows/Plan 9")
-               return
+               t.Skip("Skipping test: symlinks don't exist under Windows/Plan 9")
        }
 
-       tmpDir := TempDir()
+       tmpDir, err := ioutil.TempDir("", "TestMkdirAllWithSymlink-")
+       if err != nil {
+               t.Fatal(err)
+       }
+       defer RemoveAll(tmpDir)
+
        dir := tmpDir + "/dir"
-       err := Mkdir(dir, 0755)
+       err = Mkdir(dir, 0755)
        if err != nil {
                t.Fatalf("Mkdir %s: %s", dir, err)
        }
-       defer RemoveAll(dir)
 
        link := tmpDir + "/link"
        err = Symlink("dir", link)
        if err != nil {
                t.Fatalf("Symlink %s: %s", link, err)
        }
-       defer RemoveAll(link)
 
        path := link + "/foo"
        err = MkdirAll(path, 0755)