From 4199be97807bde2145e251cae8704d02e5390ebf Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Thu, 28 Oct 2021 16:44:34 +0200
Subject: [PATCH] ci: increase timeout to 20 minutes

---
 .circleci/config.yml | 7 ++++++-
 Makefile             | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b3a3039d..6c8193ae 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,7 +117,10 @@ commands:
           key: wasi-libc-sysroot-systemclang-v3
           paths:
             - lib/wasi-libc/sysroot
-      - run: go test -v -tags=llvm<<parameters.llvm>> ./cgo ./compileopts ./compiler ./interp ./transform .
+      - run:
+          name: "Test TinyGo"
+          command: go test -v -timeout=20m -tags=llvm<<parameters.llvm>> ./cgo ./compileopts ./compiler ./interp ./transform .
+          no_output_timeout: 20m
       - run: make gen-device -j4
       - run: make smoketest XTENSA=0
       - run: make tinygo-test
@@ -185,6 +188,7 @@ commands:
       - run:
           name: "Test TinyGo"
           command: make ASSERT=1 test
+          no_output_timeout: 20m
           environment:
             # Note: -p=2 limits parallelism to two jobs at a time, which is
             # necessary to keep memory consumption down and avoid OOM (for a
@@ -346,6 +350,7 @@ commands:
       - run:
           name: "Test TinyGo"
           command: make test
+          no_output_timeout: 20m
       - run:
           name: "Build TinyGo release"
           command: |
diff --git a/Makefile b/Makefile
index 11946b69..3af2c52f 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ tinygo:
 	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build -buildmode exe -o build/tinygo$(EXE) -tags byollvm -ldflags="-X main.gitSha1=`git rev-parse --short HEAD`" .
 
 test: wasi-libc
-	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -buildmode exe -tags byollvm ./builder ./cgo ./compileopts ./compiler ./interp ./transform .
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test -v -timeout=20m -buildmode exe -tags byollvm ./builder ./cgo ./compileopts ./compiler ./interp ./transform .
 
 TEST_PACKAGES = \
 	compress/bzip2 \