From 8f19c926c0d5231ede61a831050664103e54000e Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Wed, 2 Aug 2017 18:03:19 -0400 Subject: [PATCH] Run tests only once on FreeBSD due to Travis timeout --- other/travis/env-freebsd.sh | 4 ++++ other/travis/toxcore-script | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/other/travis/env-freebsd.sh b/other/travis/env-freebsd.sh index 16e93467..f9aa0cbf 100644 --- a/other/travis/env-freebsd.sh +++ b/other/travis/env-freebsd.sh @@ -8,6 +8,10 @@ NPROC=`nproc` CURDIR=/root RUN_TESTS=true MAKE=gmake +# A lot of tests fail and run for the full 2 minutes allowed, resulting in +# Travis build timing out, so we restrict it to just 1 test run until enough +# tests are fixed so that they succeed and don't run the full 2 minutes. +MAX_TEST_RETRIES=1 SCREEN_SESSION=freebsd SSH_PORT=10022 diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script index e8d31d4e..4f5a58ea 100755 --- a/other/travis/toxcore-script +++ b/other/travis/toxcore-script @@ -38,5 +38,5 @@ export CTEST_OUTPUT_ON_FAILURE=1 RUN $MAKE -C$BUILD_DIR -j$NPROC -k install if $RUN_TESTS; then - TESTS $MAX_TEST_RETRIES make -C$BUILD_DIR -j$NPROC test ARGS="--rerun-failed" + TESTS $MAX_TEST_RETRIES $MAKE -C$BUILD_DIR -j$NPROC test ARGS="--rerun-failed" CTEST_OUTPUT_ON_FAILURE="$CTEST_OUTPUT_ON_FAILURE" fi