From: Brad Fitzpatrick Date: Fri, 15 Dec 2017 16:34:39 +0000 (+0000) Subject: cmd/dist: let misc/cgo/testshared test timeout be scaled by slow builder X-Git-Tag: go1.10beta2~97 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f2ddcca22467c00c058f352aa51e6bbcfb530de3;p=gostls13.git cmd/dist: let misc/cgo/testshared test timeout be scaled by slow builder The default test timeout is 10 minutes if unspecified. The misc/cgo/testshared test didn't use t.timeout(sec), which respects GO_TEST_TIMEOUT_SCALE, so all builders got the default 10 minute timeout. arm5 needs more, though, so specify 10 minutes explicitly, which will then get scaled accordingly on slower builders. Change-Id: I19ecfdcd9c865f2b69524484415b8fbd2852718e Reviewed-on: https://go-review.googlesource.com/84315 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Andrew Bonventre --- diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index f040d4e3f6..5842a98233 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -648,7 +648,7 @@ func (t *tester) registerTests() { t.registerHostTest("testcshared", "../misc/cgo/testcshared", "misc/cgo/testcshared", "cshared_test.go") } if t.supportedBuildmode("shared") { - t.registerTest("testshared", "../misc/cgo/testshared", t.goTest()) + t.registerTest("testshared", "../misc/cgo/testshared", t.goTest(), t.timeout(600)) } if t.supportedBuildmode("plugin") { t.registerTest("testplugin", "../misc/cgo/testplugin", "./test.bash")