[release-branch.go1.9] cmd/go: clean up x.exe properly in TestImportMain

More generally I'm concerned about these tests using
$GOROOT/src/cmd/go as scratch space, especially
combined wtih tg.parallel() - it's easy to believe some other
test might inadvertently also try to write x.exe about the
same time. This CL only solves the "didn't clean up x.exe"
problem and leaves for another day the "probably shouldn't
write to cmd/go at all" problem.

Fixes #22266.

Change-Id: I651534d70e2d360138e0373fb4a316081872550b
Reviewed-on: https://go-review.googlesource.com/71410
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-on: https://go-review.googlesource.com/71530

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index 234e560e6bcba769abd6ff313446e535d816454c..04df14fca989de4f928139a3234e105fc4f5c0e8 100644 (file)
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -2847,7 +2847,7 @@ func TestImportMain(t *testing.T) {
                func TestFoo(t *testing.T) {}
        `)
        tg.setenv("GOPATH", tg.path("."))
-       tg.creatingTemp("x")
+       tg.creatingTemp("x" + exeSuffix)
        tg.run("build", "x")
        tg.run("test", "x")