]> Cypherpunks repositories - gostls13.git/commitdiff
os: handle TMPDIR in TempDir on Plan 9
authorDavid du Colombier <0intro@gmail.com>
Fri, 17 Aug 2018 22:05:46 +0000 (00:05 +0200)
committerBrad Fitzpatrick <bradfitz@golang.org>
Fri, 17 Aug 2018 23:12:06 +0000 (23:12 +0000)
CL 129063 added a test in TestScript/mod_enabled,
which was failing on Plan 9.

The test was failing because the Init function
of the cmd/go/internal/modload package was
expecting ModRoot to be part of os.TempDir.

However, ModRoot was set to TMPDIR, while
os.TempDir is returning /tmp on Plan 9.

This change fixes the implementation of
os.TempDir on Plan 9 to handle the TMPDIR
environment variable, similarly to Unix.

Fixes #27065.

Change-Id: Id6ff926c5c379f63cab2dfc378fa6c15293fd453
Reviewed-on: https://go-review.googlesource.com/129775
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/os/file_plan9.go

index 3a0b774aa2d7dd403280199e5f768e6a818de625..2c74403434317ca953bc8ced3cc5235db9422ea7 100644 (file)
@@ -478,7 +478,12 @@ func (f *File) Chown(uid, gid int) error {
 }
 
 func tempDir() string {
-       return "/tmp"
+       dir := Getenv("TMPDIR")
+       if dir == "" {
+               dir = "/tmp"
+       }
+       return dir
+
 }
 
 // Chdir changes the current working directory to the file,