From 90de5e817c257ffea8dbba12a9f012e22b8c0c7c Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 1 Feb 2017 12:28:47 +0100 Subject: [PATCH] misc/ios: use the default go test timeout If -test.timeout is not specified to go test, it will time out after a default 10 minutes. The iOS exec wrapper also contains a fail safe timeout mechanism for a stuck device. However, if no explicit -test.timeout is specified, it will use a timeout of 0, plus some constant amount. Use the same default timeout in the exec wrapper as for go test, 10 minutes. Change-Id: I6465ccd9f7b9ce08fa302e6697f7938a0ea9af34 Reviewed-on: https://go-review.googlesource.com/36062 Reviewed-by: David Crawshaw Run-TryBot: Elias Naur TryBot-Result: Gobot Gobot --- misc/ios/go_darwin_arm_exec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/ios/go_darwin_arm_exec.go b/misc/ios/go_darwin_arm_exec.go index 9ec55b11be..bbc17f06ff 100644 --- a/misc/ios/go_darwin_arm_exec.go +++ b/misc/ios/go_darwin_arm_exec.go @@ -448,7 +448,7 @@ func parseArgs(binArgs []string) (opts options, remainingArgs []string) { remainingArgs = append(remainingArgs, arg) } f := flag.NewFlagSet("", flag.ContinueOnError) - f.DurationVar(&opts.timeout, "test.timeout", 0, "") + f.DurationVar(&opts.timeout, "test.timeout", 10*time.Minute, "") f.BoolVar(&opts.lldb, "lldb", false, "") f.Parse(flagArgs) return opts, remainingArgs