mirror of
https://github.com/golang/go.git
synced 2026-08-02 05:25:23 +08:00
cmd/dist: drop 3 minute (or 9 for cmd/go) custom timeout for std cmd
The reason we have these particular custom timeouts in cmd/dist today is because CL 120762 increased cmd/go timeout from 6 minutes to 9, and before that CL 84235 increased cmd/go timeout from 3 minutes to 6, and before that CL 12368 increased std cmd timeout from 2 minutes to 3. The original 2 minute per-package timeout was added in 14 years ago in CL 5604051, where the motivation was to have _some_ hard limit. Today we have a hard limit via the go command (as well as via LUCI), so it's safe to drop the custom timeout given it has become a no-op as of CL 789886, and because the original reason it was added continues to be in place via other means. For #79970. Change-Id: I32d3d34cd6d380453d65d43b6ddf90e4b90dec61 Reviewed-on: https://go-review.googlesource.com/c/go/+/790000 Reviewed-by: Michael Matloob <matloob@golang.org> LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Michael Matloob <matloob@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
This commit is contained in:
parent
94e11b4d4d
commit
9af3834f31
8
src/cmd/dist/test.go
vendored
8
src/cmd/dist/test.go
vendored
@ -588,15 +588,7 @@ func (t *tester) registerStdTest(pkg string) {
|
||||
defer timelog("end", dt.name)
|
||||
ranGoTest = true
|
||||
|
||||
timeoutSec := 180 * time.Second
|
||||
for _, pkg := range stdMatches {
|
||||
if pkg == "cmd/go" {
|
||||
timeoutSec *= 3
|
||||
break
|
||||
}
|
||||
}
|
||||
return (&goTest{
|
||||
timeout: timeoutSec,
|
||||
gcflags: gcflags,
|
||||
pkgs: stdMatches,
|
||||
}).run(t)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user