From e7f86341fed2a378ace0c81499844f6ac30c9d42 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 6 Jul 2017 00:14:15 -0400 Subject: [PATCH] cmd/go: fix docs for -timeout The text before CL 45816 was: -timeout t If a test runs longer than t, panic. The default is 10 minutes (10m). CL 45816 was supposed to be about clarifying test vs test binary, and it did add the clarification of referring to "duration d", but it also introduced incorrect text about timeout 0. The new text in this CL preserves the good change and eliminates the incorrect one: -timeout d If a test binary runs longer than duration d, panic. The default is 10 minutes (10m). For #14780. Change-Id: I4f79d6e48ed9295bc9f34a36aa90d3b03b40d7f5 Reviewed-on: https://go-review.googlesource.com/47571 Run-TryBot: Russ Cox Reviewed-by: Brad Fitzpatrick --- src/cmd/go/alldocs.go | 3 +-- src/cmd/go/internal/test/test.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go index aaeaab60cf4efe..7dd7ba90f0941e 100644 --- a/src/cmd/go/alldocs.go +++ b/src/cmd/go/alldocs.go @@ -1499,8 +1499,7 @@ // exhaustive tests. // // -timeout d -// If the cumulative test time for a package runs longer than -// duration d, panic. Timeout is disabled if set to 0. +// If a test binary runs longer than duration d, panic. // The default is 10 minutes (10m). // // -v diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go index 38b7e3fda3e7cf..ebebffd77777db 100644 --- a/src/cmd/go/internal/test/test.go +++ b/src/cmd/go/internal/test/test.go @@ -224,8 +224,7 @@ const testFlag2 = ` exhaustive tests. -timeout d - If the cumulative test time for a package runs longer than - duration d, panic. Timeout is disabled if set to 0. + If a test binary runs longer than duration d, panic. The default is 10 minutes (10m). -v