From 5dd10cc79d063b0563a7bfb58c7bfc4befdadb3b Mon Sep 17 00:00:00 2001 From: Fabian Fichter Date: Sat, 23 Mar 2019 16:48:59 +0100 Subject: [PATCH] Avoid timeouts in travis builds --- .travis.yml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d68f144..2c369e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,11 +63,11 @@ script: # Valgrind # - export CXXFLAGS="-O1 -fno-inline" - - if [ -x "$(command -v valgrind )" ]; then make clean && make -j2 ARCH=x86-64 debug=yes optimize=no build > /dev/null && ../tests/instrumented.sh --valgrind; fi - - if [ -x "$(command -v valgrind )" ]; then ../tests/instrumented.sh --valgrind-thread; fi + - if [ -x "$(command -v valgrind )" ]; then make clean && make -j2 ARCH=x86-64 debug=yes optimize=no build > /dev/null && travis_wait ../tests/instrumented.sh --valgrind; fi + - if [ -x "$(command -v valgrind )" ]; then travis_wait ../tests/instrumented.sh --valgrind-thread; fi # # Sanitizer # # Use g++-8 as a proxy for having sanitizers, might need revision as they become available for more recent versions of clang/gcc - - if [[ "$COMPILER" == "g++-8" ]]; then make clean && make -j2 ARCH=x86-64 sanitize=undefined optimize=no debug=yes build > /dev/null && ../tests/instrumented.sh --sanitizer-undefined; fi + - if [[ "$COMPILER" == "g++-8" ]]; then make clean && make -j2 ARCH=x86-64 sanitize=undefined optimize=no debug=yes build > /dev/null && travis_wait ../tests/instrumented.sh --sanitizer-undefined; fi #- if [[ "$COMPILER" == "g++-8" ]]; then make clean && make -j2 ARCH=x86-64 sanitize=thread optimize=no debug=yes build > /dev/null && ../tests/instrumented.sh --sanitizer-thread; fi -- 1.7.0.4