Skip to content

Commit 09d852c

Browse files
dmitshurgopherbot
authored andcommitted
cmd/dist: remove hardcoded timeout scale for arm and mips{,le,64,64le}
Fixes #57117. Change-Id: If36da5b138a5e92e27688719ffc1c4dafd590957 Reviewed-on: https://go-review.googlesource.com/c/go/+/455518 Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Bryan Mills <[email protected]> Reviewed-by: Austin Clements <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 62a9948 commit 09d852c

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

src/cmd/dist/test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,6 @@ func (t *tester) run() {
193193
}
194194

195195
t.timeoutScale = 1
196-
switch goarch {
197-
case "arm":
198-
t.timeoutScale = 2
199-
case "mips", "mipsle", "mips64", "mips64le":
200-
t.timeoutScale = 4
201-
}
202196
if s := os.Getenv("GO_TEST_TIMEOUT_SCALE"); s != "" {
203197
t.timeoutScale, err = strconv.Atoi(s)
204198
if err != nil {

src/run.bash

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
# and will be removed if it stops being needed. See go.dev/issue/12508.
2121
#
2222
# GO_TEST_TIMEOUT_SCALE: a non-negative integer factor to scale test timeout by.
23-
# Defaults to 1, or as a special case for the purpose of the Go build system (x/build),
24-
# defaults to 2 when GOARCH is arm, and to 4 when GOARCH is mips, mipsle, mips64, or mips64le.
23+
# Defaults to 1.
2524

2625
set -e
2726

0 commit comments

Comments
 (0)