diff options
| author | Dmitri Shuralyov <dmitshur@golang.org> | 2022-12-02 13:40:49 -0500 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-01-20 17:47:35 +0000 |
| commit | 09d852ceac9da5cf879b3a2f8146c5d0dd4b26fa (patch) | |
| tree | 9863f4f07e4f887eb5e1fa06062cacb699deb507 | |
| parent | 62a994837a57a7d0c58bb364b580a389488446c9 (diff) | |
| download | go-09d852ceac9da5cf879b3a2f8146c5d0dd4b26fa.tar.xz | |
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 <dmitshur@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
| -rw-r--r-- | src/cmd/dist/test.go | 6 | ||||
| -rwxr-xr-x | src/run.bash | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 9700e15738..a94945893c 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -193,12 +193,6 @@ func (t *tester) run() { } t.timeoutScale = 1 - switch goarch { - case "arm": - t.timeoutScale = 2 - case "mips", "mipsle", "mips64", "mips64le": - t.timeoutScale = 4 - } if s := os.Getenv("GO_TEST_TIMEOUT_SCALE"); s != "" { t.timeoutScale, err = strconv.Atoi(s) if err != nil { diff --git a/src/run.bash b/src/run.bash index 35fa8f626c..6274df6fb3 100755 --- a/src/run.bash +++ b/src/run.bash @@ -20,8 +20,7 @@ # and will be removed if it stops being needed. See go.dev/issue/12508. # # GO_TEST_TIMEOUT_SCALE: a non-negative integer factor to scale test timeout by. -# Defaults to 1, or as a special case for the purpose of the Go build system (x/build), -# defaults to 2 when GOARCH is arm, and to 4 when GOARCH is mips, mipsle, mips64, or mips64le. +# Defaults to 1. set -e |