5 files changed, 16 insertions, 6 deletions

diff --git a/other/travis/env-linux.sh b/other/travis/env-linux.sh
index 1782c229..68687a2b 100644
--- a/other/travis/env-linux.sh
+++ b/other/travis/env-linux.sh
@@ -11,8 +11,10 @@ RUN() {
 }
 
 TESTS() {
-  # Keep running tests until they eventually succeed or Travis times out after
-  # 50 minutes. This cuts down on the time lost when tests fail, because we no
-  # longer need to manually restart the build and wait for compilation.
-  "$@" || TESTS "$@"
+  COUNT="$1"; shift
+  "$@" || {
+    if [ $COUNT -gt 1 ]; then
+      TESTS `expr $COUNT - 1` "$@"
+    fi
+  }
 }
diff --git a/other/travis/env-osx.sh b/other/travis/env-osx.sh
index b68a8651..747df32d 100644
--- a/other/travis/env-osx.sh
+++ b/other/travis/env-osx.sh
@@ -10,5 +10,10 @@ RUN() {
 }
 
 TESTS() {
-  "$@"
+  COUNT="$1"; shift
+  "$@" || {
+    if [ $COUNT -gt 1 ]; then
+      TESTS `expr $COUNT - 1` "$@"
+    fi
+  }
 }
diff --git a/other/travis/env-windows.sh b/other/travis/env-windows.sh
index 410948c1..6f7f0914 100644
--- a/other/travis/env-windows.sh
+++ b/other/travis/env-windows.sh
@@ -11,6 +11,8 @@ RUN() {
 }
 
 TESTS() {
+  shift # Ignore test run count.
+
   # Download Microsoft DLLs.
   curl http://www.dlldump.com/dllfiles/I/iphlpapi.dll -o _build/iphlpapi.dll
   curl http://www.dlldump.com/dllfiles/W/ws2_32.dll -o _build/ws2_32.dll
diff --git a/other/travis/env.sh b/other/travis/env.sh
index 55ab30ca..4899ec25 100644
--- a/other/travis/env.sh
+++ b/other/travis/env.sh
@@ -10,6 +10,7 @@ export CFLAGS="-O3 -DTRAVIS_ENV=1"
 export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON -DBUILD_NTOX=ON"
 
 BUILD_DIR=_build
+MAX_TEST_RETRIES=3
 
 # Workaround for broken Travis image.
 export TERM=xterm
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index 3b8b5eb4..758d3430 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 make -C$BUILD_DIR -j$NPROC test ARGS="--rerun-failed"
+  TESTS $MAX_TEST_RETRIES make -C$BUILD_DIR -j$NPROC test ARGS="--rerun-failed"
 fi