commit 52ed713870a0f05bc4125608f32376dcb759a662
author Than McIntosh <thanm@google.com> Thu May 31 07:41:04 2018 -0400
committer Than McIntosh <thanm@google.com> Fri Jun 01 14:58:44 2018 +0000
tree 073d77b89a0d8cfde80368bff84e6b544638771e
parent 75a84fdf45d2a5e272bce5d8476b849698b3d103

gollvm: increase gotools check target timeouts

Tweak the timeouts used for go tools check targets. Use 500 seconds
for the cmd/go test, since it is especially large and complex; other
targets now time out at 250 seconds.

Change-Id: I41fc2ef4db312ece83eab8527647b8c0b17d4dc0
Reviewed-on: https://go-review.googlesource.com/115378
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>

gotools/CMakeLists.txt

diff --git a/gotools/CMakeLists.txt b/gotools/CMakeLists.txt
index 78df674..4cc04a3 100644
--- a/gotools/CMakeLists.txt
+++ b/gotools/CMakeLists.txt
@@ -138,6 +138,11 @@
 # List containing all the check targets.
 set(checktargets)
 
+# Timeouts for check targets. The cmd/go test is large and complex; needs
+# a longer timeout than the other targets.
+set(cmdgo_check_timeout 500)
+set(default_check_timeout 250)
+
 # This test target runs `go test cmd/go` within the build environment.
 set(targetname "check_go_tool")
 add_custom_target(
@@ -155,7 +160,7 @@
     "COPYFILES"
        "${libgo_binroot}/zdefaultcc.go:src/cmd/go/internal/cfg/"
        "${libgo_binroot}/objabi.go:src/cmd/internal/objabi"
-    "TIMEOUT" 200
+    "TIMEOUT" ${cmdgo_check_timeout}
     "GOC" "${rungoc}"
     "BINDIR" ${gotools_binroot}
     "LIBDIR" ${libgo_binroot}
@@ -175,7 +180,7 @@
     "LOGFILE" "${gotools_binroot}/cmd_vet-testlog"
     "SETENV" "GOPATH=${gotools_binroot}/check-vet-dir"
     "COPYDIRS" "${cmd_srcroot}/vet:src/cmd"
-    "TIMEOUT" 100
+    "TIMEOUT" ${default_check_timeout}
     "GOC" "${rungoc}"
     "BINDIR" ${gotools_binroot}
     "LIBDIR" ${libgo_binroot}
@@ -193,7 +198,7 @@
     "SUBDIR" "misc/cgo/test"
     "LOGFILE" "${gotools_binroot}/cmd_cgo-testlog"
     "COPYDIRS" "${libgo_srcroot}/misc/cgo/test:misc/cgo"
-    "TIMEOUT" 100
+    "TIMEOUT" ${default_check_timeout}
     "GOC" "${rungoc}"
     "SETENV" "GOTRACEBACK=2"
     "BINDIR" ${gotools_binroot}
@@ -212,7 +217,7 @@
     "SUBDIR" "misc/cgo/testcarchive"
     "LOGFILE" "${gotools_binroot}/cmd_carchive-testlog"
     "COPYDIRS" "${libgo_srcroot}/misc/cgo/testcarchive:misc/cgo"
-    "TIMEOUT" 100
+    "TIMEOUT" ${default_check_timeout}
     "GOC" "${rungoc}"
     "CC" "${runcc}"
     "TESTARG" "carchive_test.go"
@@ -249,6 +254,4 @@
 
 add_custom_target(check-gotools DEPENDS ${checktargets})
 
-# FIXME: add install rules
-
 message(STATUS "gotools configuration complete.")