test: avoid writing temporary files to GOROOT

This reverts CL 207477, restoring CL 207352 with a fix for the
regression observed in the Windows builders.

cmd/compile evidently does not fully support NUL as an output on
Windows, so this time we write ignored 'compile' outputs
to temporary files (instead of os.DevNull as in CL 207352).

Updates #28387
Fixes #35619

Change-Id: I2edc5727c3738fa1bccb4b74e50d114cf2a7fcff
Reviewed-on: https://go-review.googlesource.com/c/go/+/207602
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 1a4c6344b477d14be13d624e712b5912221d91f9..559c61a916300ea4752efda57470aca7134fefa0 100644 (file)
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -1358,17 +1358,21 @@ var runtest struct {
 
 func (t *tester) testDirTest(dt *distTest, shard, shards int) error {
        runtest.Do(func() {
-               const exe = "runtest.exe" // named exe for Windows, but harmless elsewhere
-               cmd := t.dirCmd("test", "go", "build", "-o", exe, "run.go")
-               cmd.Env = append(os.Environ(), "GOOS="+gohostos, "GOARCH="+gohostarch)
-               runtest.exe = filepath.Join(cmd.Dir, exe)
-               if err := cmd.Run(); err != nil {
+               f, err := ioutil.TempFile("", "runtest-*.exe") // named exe for Windows, but harmless elsewhere
+               if err != nil {
                        runtest.err = err
                        return
                }
+               f.Close()
+
+               runtest.exe = f.Name()
                xatexit(func() {
                        os.Remove(runtest.exe)
                })
+
+               cmd := t.dirCmd("test", "go", "build", "-o", runtest.exe, "run.go")
+               cmd.Env = append(os.Environ(), "GOOS="+gohostos, "GOARCH="+gohostarch)
+               runtest.err = cmd.Run()
        })
        if runtest.err != nil {
                return runtest.err

diff --git a/test/fixedbugs/bug302.go b/test/fixedbugs/bug302.go
index c763b87786e62981a734de84c02fc6b03e6dbed7..87f9d4ef70ccc1ddc0cc6f3a528fc161294d9402 100644 (file)
--- a/test/fixedbugs/bug302.go
+++ b/test/fixedbugs/bug302.go
@@ -9,22 +9,34 @@ package main
 
 import (
        "fmt"
+       "io/ioutil"
        "os"
        "os/exec"
        "path/filepath"
 )
 
+var tmpDir string
+
 func main() {
-       run("go", "tool", "compile", filepath.Join("fixedbugs", "bug302.dir", "p.go"))
+       fb, err := filepath.Abs("fixedbugs")
+       if err == nil {
+               tmpDir, err = ioutil.TempDir("", "bug302")
+       }
+       if err != nil {
+               fmt.Println(err)
+               os.Exit(1)
+       }
+       defer os.RemoveAll(tmpDir)
+
+       run("go", "tool", "compile", filepath.Join(fb, "bug302.dir", "p.go"))
        run("go", "tool", "pack", "grc", "pp.a", "p.o")
-       run("go", "tool", "compile", "-I", ".", filepath.Join("fixedbugs", "bug302.dir", "main.go"))
-       os.Remove("p.o")
-       os.Remove("pp.a")
-       os.Remove("main.o")
+       run("go", "tool", "compile", "-I", ".", filepath.Join(fb, "bug302.dir", "main.go"))
 }
 
 func run(cmd string, args ...string) {
-       out, err := exec.Command(cmd, args...).CombinedOutput()
+       c := exec.Command(cmd, args...)
+       c.Dir = tmpDir
+       out, err := c.CombinedOutput()
        if err != nil {
                fmt.Println(string(out))
                fmt.Println(err)

diff --git a/test/fixedbugs/bug369.go b/test/fixedbugs/bug369.go
index e2a1147735c2646993716c8e3a69e336f6338134..9316f7aad0b1df71d896b56ad0e02d6c37d3c108 100644 (file)
--- a/test/fixedbugs/bug369.go
+++ b/test/fixedbugs/bug369.go
@@ -11,6 +11,7 @@ package main
 
 import (
        "fmt"
+       "io/ioutil"
        "os"
        "os/exec"
        "path/filepath"
@@ -20,16 +21,19 @@ func main() {
        err := os.Chdir(filepath.Join(".", "fixedbugs", "bug369.dir"))
        check(err)
 
-       run("go", "tool", "compile", "-N", "-o", "slow.o", "pkg.go")
-       run("go", "tool", "compile", "-o", "fast.o", "pkg.go")
-       run("go", "tool", "compile", "-o", "main.o", "main.go")
-       run("go", "tool", "link", "-o", "a.exe", "main.o")
-       run("." + string(filepath.Separator) + "a.exe")
+       tmpDir, err := ioutil.TempDir("", "bug369")
+       check(err)
+       defer os.RemoveAll(tmpDir)
+
+       tmp := func(name string) string {
+               return filepath.Join(tmpDir, name)
+       }
 
-       os.Remove("slow.o")
-       os.Remove("fast.o")
-       os.Remove("main.o")
-       os.Remove("a.exe")
+       run("go", "tool", "compile", "-N", "-o", tmp("slow.o"), "pkg.go")
+       run("go", "tool", "compile", "-o", tmp("fast.o"), "pkg.go")
+       run("go", "tool", "compile", "-D", tmpDir, "-o", tmp("main.o"), "main.go")
+       run("go", "tool", "link", "-o", tmp("a.exe"), tmp("main.o"))
+       run(tmp("a.exe"))
 }
 
 func run(name string, args ...string) {

diff --git a/test/fixedbugs/issue9355.go b/test/fixedbugs/issue9355.go
index 9657e644915f5c1dbd3ab91e9b5838357e242791..2498bf6a1beedec98f80d06ce81f2035750b4a3f 100644 (file)
--- a/test/fixedbugs/issue9355.go
+++ b/test/fixedbugs/issue9355.go
@@ -8,6 +8,7 @@ package main
 
 import (
        "fmt"
+       "io/ioutil"
        "os"
        "os/exec"
        "path/filepath"
@@ -23,8 +24,15 @@ func main() {
        err := os.Chdir(filepath.Join("fixedbugs", "issue9355.dir"))
        check(err)
 
-       out := run("go", "tool", "compile", "-S", "a.go")
-       os.Remove("a.o")
+       f, err := ioutil.TempFile("", "issue9355-*.o")
+       if err != nil {
+               fmt.Println(err)
+               os.Exit(1)
+       }
+       f.Close()
+
+       out := run("go", "tool", "compile", "-o", f.Name(), "-S", "a.go")
+       os.Remove(f.Name())
 
        // 6g/8g print the offset as dec, but 5g/9g print the offset as hex.
        patterns := []string{

diff --git a/test/linkmain_run.go b/test/linkmain_run.go
index 68d53e8cad9a0e88e3f4dd3069881303dfea6e39..077f7ee91753c56d23177873274be2ea9208a090 100644 (file)
--- a/test/linkmain_run.go
+++ b/test/linkmain_run.go
@@ -11,21 +11,21 @@ package main
 
 import (
        "fmt"
+       "io/ioutil"
        "os"
        "os/exec"
+       "path/filepath"
        "strings"
 )
 
+var tmpDir string
+
 func cleanup() {
-       os.Remove("linkmain.o")
-       os.Remove("linkmain.a")
-       os.Remove("linkmain1.o")
-       os.Remove("linkmain1.a")
-       os.Remove("linkmain.exe")
+       os.RemoveAll(tmpDir)
 }
 
-func run(cmdline string) {
-       args := strings.Fields(cmdline)
+func run(cmdline ...string) {
+       args := strings.Fields(strings.Join(cmdline, " "))
        cmd := exec.Command(args[0], args[1:]...)
        out, err := cmd.CombinedOutput()
        if err != nil {
@@ -37,8 +37,8 @@ func run(cmdline string) {
        }
 }
 
-func runFail(cmdline string) {
-       args := strings.Fields(cmdline)
+func runFail(cmdline ...string) {
+       args := strings.Fields(strings.Join(cmdline, " "))
        cmd := exec.Command(args[0], args[1:]...)
        out, err := cmd.CombinedOutput()
        if err == nil {
@@ -51,16 +51,26 @@ func runFail(cmdline string) {
 }
 
 func main() {
+       var err error
+       tmpDir, err = ioutil.TempDir("", "")
+       if err != nil {
+               fmt.Println(err)
+               os.Exit(1)
+       }
+       tmp := func(name string) string {
+               return filepath.Join(tmpDir, name)
+       }
+
        // helloworld.go is package main
-       run("go tool compile -o linkmain.o helloworld.go")
-       run("go tool compile -pack -o linkmain.a helloworld.go")
-       run("go tool link -o linkmain.exe linkmain.o")
-       run("go tool link -o linkmain.exe linkmain.a")
+       run("go tool compile -o", tmp("linkmain.o"), "helloworld.go")
+       run("go tool compile -pack -o", tmp("linkmain.a"), "helloworld.go")
+       run("go tool link -o", tmp("linkmain.exe"), tmp("linkmain.o"))
+       run("go tool link -o", tmp("linkmain.exe"), tmp("linkmain.a"))
 
        // linkmain.go is not
-       run("go tool compile -o linkmain1.o linkmain.go")
-       run("go tool compile -pack -o linkmain1.a linkmain.go")
-       runFail("go tool link -o linkmain.exe linkmain1.o")
-       runFail("go tool link -o linkmain.exe linkmain1.a")
+       run("go tool compile -o", tmp("linkmain1.o"), "linkmain.go")
+       run("go tool compile -pack -o", tmp("linkmain1.a"), "linkmain.go")
+       runFail("go tool link -o", tmp("linkmain.exe"), tmp("linkmain1.o"))
+       runFail("go tool link -o", tmp("linkmain.exe"), tmp("linkmain1.a"))
        cleanup()
 }

diff --git a/test/sinit_run.go b/test/sinit_run.go
index fdd19c492f5885244568e894b8ae21af78e787f5..c37fc9b88c8fc0df365a4ddc92ad8196d1b082d7 100644 (file)
--- a/test/sinit_run.go
+++ b/test/sinit_run.go
@@ -12,20 +12,32 @@ package main
 import (
        "bytes"
        "fmt"
+       "io/ioutil"
        "os"
        "os/exec"
 )
 
 func main() {
-       cmd := exec.Command("go", "tool", "compile", "-S", "sinit.go")
+       f, err := ioutil.TempFile("", "sinit-*.o")
+       if err != nil {
+               fmt.Println(err)
+               os.Exit(1)
+       }
+       f.Close()
+
+       cmd := exec.Command("go", "tool", "compile", "-o", f.Name(), "-S", "sinit.go")
        out, err := cmd.CombinedOutput()
+       os.Remove(f.Name())
        if err != nil {
                fmt.Println(string(out))
                fmt.Println(err)
                os.Exit(1)
        }
-       os.Remove("sinit.o")
 
+       if len(bytes.TrimSpace(out)) == 0 {
+               fmt.Println("'go tool compile -S sinit.go' printed no output")
+               os.Exit(1)
+       }
        if bytes.Contains(out, []byte("initdone")) {
                fmt.Println("sinit generated an init function")
                os.Exit(1)