From df52f3fbb46f60333c738ba52d1608a82327dbb1 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Fri, 20 Apr 2018 11:16:02 +0200 Subject: [PATCH] Travis: move timeout into docker container as suggested by jklein --- travis/build.sh | 4 ++-- travis/build_carl.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/travis/build.sh b/travis/build.sh index 9dca49549..52fe4d64f 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -43,14 +43,14 @@ linux) set +e # Execute main process - timeout $TIMEOUT_LINUX docker exec storm bash -c " + docker exec storm bash -c " export CONFIG=$CONFIG; export COMPILER=$COMPILER; export N_JOBS=$N_JOBS; export STLARG=; export OS=$OS; cd /opt/storm; - travis/build_helper.sh $1" + timeout $TIMEOUT_LINUX ./travis/build_helper.sh $1" EXITCODE=$? ;; diff --git a/travis/build_carl.sh b/travis/build_carl.sh index 2918a4af7..37be2a986 100755 --- a/travis/build_carl.sh +++ b/travis/build_carl.sh @@ -18,14 +18,14 @@ linux) set +e # Execute main process - timeout $TIMEOUT_LINUX docker exec carl bash -c " + docker exec carl bash -c " export CONFIG=$CONFIG; export COMPILER=$COMPILER; export N_JOBS=$N_JOBS; export STLARG=; export OS=$OS; cd /opt/; - ./build_carl_helper.sh" + timeout $TIMEOUT_LINUX ./build_carl_helper.sh" ;; osx)