summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--other/travis/env-freebsd.sh4
-rwxr-xr-xother/travis/toxcore-script2
2 files changed, 5 insertions, 1 deletions
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`
8CURDIR=/root 8CURDIR=/root
9RUN_TESTS=true 9RUN_TESTS=true
10MAKE=gmake 10MAKE=gmake
11# A lot of tests fail and run for the full 2 minutes allowed, resulting in
12# Travis build timing out, so we restrict it to just 1 test run until enough
13# tests are fixed so that they succeed and don't run the full 2 minutes.
14MAX_TEST_RETRIES=1
11 15
12SCREEN_SESSION=freebsd 16SCREEN_SESSION=freebsd
13SSH_PORT=10022 17SSH_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
38 38
39RUN $MAKE -C$BUILD_DIR -j$NPROC -k install 39RUN $MAKE -C$BUILD_DIR -j$NPROC -k install
40if $RUN_TESTS; then 40if $RUN_TESTS; then
41 TESTS $MAX_TEST_RETRIES make -C$BUILD_DIR -j$NPROC test ARGS="--rerun-failed" 41 TESTS $MAX_TEST_RETRIES $MAKE -C$BUILD_DIR -j$NPROC test ARGS="--rerun-failed" CTEST_OUTPUT_ON_FAILURE="$CTEST_OUTPUT_ON_FAILURE"
42fi 42fi