From 44982ea98d0704f5daedd05f721ff44e2037415c Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Mon, 23 Jul 2018 17:10:21 +0200
Subject: [PATCH] make: if timeout not set, use 20m instead of default 10m

go test's default timeout is 10m, which is no longer enough during
integration tests. This commit increases it to 20m.
---
 make/testing_flags.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/testing_flags.mk b/make/testing_flags.mk
index 0180f85b..308f83f9 100644
--- a/make/testing_flags.mk
+++ b/make/testing_flags.mk
@@ -20,9 +20,11 @@ TEST_FLAGS += -test.run=TestLightningNetworkDaemon/$(icase)
 endif
 
 # If a timeout was requested, construct initialize the proper flag for the go
-# test command.
+# test command. If not, we set 20m (up from the default 10m).
 ifneq ($(timeout),)
 TEST_FLAGS += -test.timeout=$(timeout)
+else
+TEST_FLAGS += -test.timeout=20m
 endif
 
 # UNIT_TARGTED is undefined iff a specific package and/or unit test case is