From: Elias Naur <elias.naur@gmail.com>
Date: Sun, 29 Jan 2017 22:57:14 +0000 (+0100)
Subject: cmd/dist: use the target GOOS to skip the test for issue 18153
X-Git-Tag: go1.8~22^2~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4cffe2b604d0980e6fb9b994b31f69c53045a460;p=gostls13.git

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 7d5f79f339..8ad4a8620d 100644
--- 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",