From 66f9a6f90e9ffe7c58d5c1fe32af84e16ea74ab8 Mon Sep 17 00:00:00 2001
From: OkamotoYuki <okamoto.yuki.0130@gmail.com>
Date: Thu, 7 Mar 2019 00:31:04 +0900
Subject: [PATCH] cmd/go/internal/test: pass default timeout to test programs
 even if it is not given from command line

Make 'go test' command to pass the default timeout (10m) to test programs even if the value is not given from command line.

Fixes #28147
---
 src/cmd/go/internal/test/test.go            | 15 ++++++++++++---
 src/cmd/go/testdata/script/test_timeout.txt | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 src/cmd/go/testdata/script/test_timeout.txt

diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go
index fe90af3be51f5..bb724e557b2f8 100644
--- a/src/cmd/go/internal/test/test.go
+++ b/src/cmd/go/internal/test/test.go
@@ -484,8 +484,9 @@ var (
 	pkgArgs          []string
 	pkgs             []*load.Package
 
-	testKillTimeout = 10 * time.Minute
-	testCacheExpire time.Time // ignore cached test results before this time
+	testActualTimeout = 10 * time.Minute                  // actual timeout which is passed to tests
+	testKillTimeout   = testActualTimeout + 1*time.Minute // backup alarm
+	testCacheExpire   time.Time                           // ignore cached test results before this time
 )
 
 // testVetFlags is the list of flags to pass to vet when invoked automatically during go test.
@@ -552,13 +553,21 @@ func runTest(cmd *base.Command, args []string) {
 	// the test wedges with a goroutine spinning and its background
 	// timer does not get a chance to fire.
 	if dt, err := time.ParseDuration(testTimeout); err == nil && dt > 0 {
-		testKillTimeout = dt + 1*time.Minute
+		testActualTimeout = dt
+		testKillTimeout = testActualTimeout + 1*time.Minute
 	} else if err == nil && dt == 0 {
 		// An explicit zero disables the test timeout.
+		// No timeout is passed to tests.
 		// Let it have one century (almost) before we kill it.
+		testActualTimeout = -1
 		testKillTimeout = 100 * 365 * 24 * time.Hour
 	}
 
+	// Pass timeout to tests if it exists.
+	if testActualTimeout > 0 {
+		testArgs = append(testArgs, "-test.timeout="+testActualTimeout.String())
+	}
+
 	// show passing test output (after buffering) with -v flag.
 	// must buffer because tests are running in parallel, and
 	// otherwise the output will get mixed.
diff --git a/src/cmd/go/testdata/script/test_timeout.txt b/src/cmd/go/testdata/script/test_timeout.txt
new file mode 100644
index 0000000000000..9087a9030e19e
--- /dev/null
+++ b/src/cmd/go/testdata/script/test_timeout.txt
@@ -0,0 +1,21 @@
+env GO111MODULE=off
+cd a
+
+# No timeout is passed via 'go test' command.
+go test -v
+stdout '10m0s'
+
+# Timeout is passed via 'go test' command.
+go test -v -timeout 30m
+stdout '30m0s'
+
+-- a/timeout_test.go --
+package t
+import (
+	"flag"
+	"fmt"
+	"testing"
+)
+func TestTimeout(t *testing.T) {
+	fmt.Println(flag.Lookup("test.timeout").Value.String())
+}
\ No newline at end of file