From 9b40592932a698c71f8e16624fad56f80c7ebdbf Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Tue, 20 Jun 2017 16:45:14 +0200 Subject: [PATCH] Smaller timeout for Mac --- travis/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/travis/build.sh b/travis/build.sh index f2abbdd99..238f113a9 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -2,7 +2,8 @@ # Inspired by https://github.com/google/fruit : ${N_JOBS:=2} -: ${TIMEOUT:=2000} +: ${TIMEOUT_MAC:=1800} +: ${TIMEOUT_LINUX:=2000} if [ "$STL" != "" ] then @@ -23,7 +24,7 @@ linux) set +e # Execute main process - timeout $TIMEOUT docker exec storm bash -c " + timeout $TIMEOUT_LINUX docker exec storm bash -c " export COMPILER=$COMPILER; export N_JOBS=$N_JOBS; export STLARG=$STLARG; @@ -45,7 +46,7 @@ osx) export N_JOBS export STLARG export OS - gtimeout $TIMEOUT travis/build-helper.sh "$1" "$2" + gtimeout $TIMEOUT_MAC travis/build-helper.sh "$1" "$2" EXITCODE=$? if [ $EXITCODE = 124 ] && [ "$2" = "BuildLib1" ] then