diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-11-15 22:10:44 +0000 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2019-11-15 22:47:41 +0000 |
| commit | 72f333a14b071e7560c67abcaacec176aaa604cf (patch) | |
| tree | 6e8edbc13161c39ebba6fabf62685de85d8b3c2f /src/cmd/dist | |
| parent | dab1a10a98e376502e0ab5dfb6d2ab82394c19b6 (diff) | |
| download | go-72f333a14b071e7560c67abcaacec176aaa604cf.tar.xz | |
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>
Diffstat (limited to 'src/cmd/dist')
| -rw-r--r-- | src/cmd/dist/test.go | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 559c61a916..1a4c6344b4 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -1358,21 +1358,17 @@ var runtest struct { func (t *tester) testDirTest(dt *distTest, shard, shards int) error { runtest.Do(func() { - f, err := ioutil.TempFile("", "runtest-*.exe") // named exe for Windows, but harmless elsewhere - if err != nil { + 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 { 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 |