cmd/dist: use the target GOOS to skip the test for issue 18153

Fixes (skips) the test on Android, where stdout/stderr are not
terminals.

Updates #18153

Change-Id: Ieca65150362a5c423747ad751e00f76f0b890746
Reviewed-on: https://go-review.googlesource.com/35957
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 7d5f79f339219800a5c326565da198b336d51eb4..8ad4a8620da0b04334bb3cacd16f1ad395b60b63 100644 (file)
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -15,7 +15,6 @@ import (
        "os/exec"
        "path/filepath"
        "regexp"
-       "runtime"
        "strconv"
        "strings"
        "sync"
@@ -354,7 +353,7 @@ func (t *tester) registerTests() {
 
        // This test needs its stdout/stderr to be terminals, so we don't run it from cmd/go's tests.
        // See issue 18153.
-       if runtime.GOOS == "linux" {
+       if t.goos == "linux" {
                t.tests = append(t.tests, distTest{
                        name:    "cmd_go_test_terminal",
                        heading: "cmd/go terminal test",