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>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 9700e15738ca91eca039bd1b0882bcd445a645ad..a94945893c4ea9617bcd725d4e31b296beb6a460 100644 (file)
--- 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 35fa8f626c4b3dc7f1e348343af5929604e800be..6274df6fb3255dd450812d43c98c77b5a1cd471f 100755 (executable)
--- 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