gotest: use build.DefaultContext.GOARCH

Fixes https://golang.org/cl/5480060/#msg4

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5485051

diff --git a/src/cmd/gotest/gotest.go b/src/cmd/gotest/gotest.go
index 7b90bbd6ab0e5280092b0654965b2837eefc9822..1c6782889085b781a5c04ce2233118f178667fd0 100644 (file)
--- a/src/cmd/gotest/gotest.go
+++ b/src/cmd/gotest/gotest.go
@@ -131,10 +131,7 @@ func setEnvironment() {
        // Basic environment.
        GOROOT = runtime.GOROOT()
        addEnv("GOROOT", GOROOT)
-       GOARCH = os.Getenv("GOARCH")
-       if GOARCH == "" {
-               GOARCH = runtime.GOARCH
-       }
+       GOARCH = build.DefaultContext.GOARCH
        addEnv("GOARCH", GOARCH)
        var err error
        O, err = build.ArchChar(GOARCH)