Revert "test: avoid writing temporary files to GOROOT"

This reverts CL 207352

Reason for revert: broke more builders than it fixed. 😞

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

1 files changed, 17 insertions, 27 deletions

diff --git a/test/linkmain_run.go b/test/linkmain_run.go
index 077f7ee917..68d53e8cad 100644
--- 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.RemoveAll(tmpDir)
+	os.Remove("linkmain.o")
+	os.Remove("linkmain.a")
+	os.Remove("linkmain1.o")
+	os.Remove("linkmain1.a")
+	os.Remove("linkmain.exe")
 }
 
-func run(cmdline ...string) {
-	args := strings.Fields(strings.Join(cmdline, " "))
+func run(cmdline string) {
+	args := strings.Fields(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(strings.Join(cmdline, " "))
+func runFail(cmdline string) {
+	args := strings.Fields(cmdline)
 	cmd := exec.Command(args[0], args[1:]...)
 	out, err := cmd.CombinedOutput()
 	if err == nil {
@@ -51,26 +51,16 @@ 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", 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"))
+	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")
 
 	// linkmain.go is not
-	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"))
+	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")
 	cleanup()
 }