Skip to content

Commit e7f8634

Browse files
committed
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 <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 79e1505 commit e7f8634

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/cmd/go/alldocs.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,8 +1499,7 @@
14991499
// exhaustive tests.
15001500
//
15011501
// -timeout d
1502-
// If the cumulative test time for a package runs longer than
1503-
// duration d, panic. Timeout is disabled if set to 0.
1502+
// If a test binary runs longer than duration d, panic.
15041503
// The default is 10 minutes (10m).
15051504
//
15061505
// -v

src/cmd/go/internal/test/test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ const testFlag2 = `
224224
exhaustive tests.
225225
226226
-timeout d
227-
If the cumulative test time for a package runs longer than
228-
duration d, panic. Timeout is disabled if set to 0.
227+
If a test binary runs longer than duration d, panic.
229228
The default is 10 minutes (10m).
230229
231230
-v

0 commit comments

Comments
 (0)