From: Shenghou Ma Date: Sun, 24 Mar 2013 08:31:28 +0000 (+0800) Subject: build: increase timeout for ARM X-Git-Tag: go1.1rc2~359 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0a517e458ce6c109e9516e9bfedaad9ee1667f2c;p=gostls13.git build: increase timeout for ARM in an effort to make builder freebsd-arm-pi and netbsd-arm-qemu pass again. R=golang-dev, r CC=golang-dev https://golang.org/cl/7621050 --- diff --git a/src/run.bash b/src/run.bash index 538d4f6fe0..5f0af5f3f2 100755 --- a/src/run.bash +++ b/src/run.bash @@ -35,16 +35,20 @@ fi # at least runtime/debug test will fail. unset GOROOT_FINAL +# increase timeout for ARM up to 3 times the normal value +timeout_scale=1 +[ "$GOARCH" == "arm" ] && timeout_scale=3 + echo '# Testing packages.' -time go test std -short -timeout=120s +time go test std -short -timeout=$(expr 120 \* $timeout_scale)s echo echo '# GOMAXPROCS=2 runtime -cpu=1,2,4' -GOMAXPROCS=2 go test runtime -short -timeout=240s -cpu=1,2,4 +GOMAXPROCS=2 go test runtime -short -timeout=$(expr 240 \* $timeout_scale)s -cpu=1,2,4 echo echo '# sync -cpu=10' -go test sync -short -timeout=120s -cpu=10 +go test sync -short -timeout=$(expr 120 \* $timeout_scale)s -cpu=10 # Race detector only supported on Linux and OS X, # and only on amd64, and only when cgo is enabled.