From 9ff60ceb31a57e95d0498881c36758ad4fbe4ca6 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sun, 26 Mar 2017 15:56:51 +0000 Subject: [PATCH 1/2] Reduce ctest timeout to 2 minutes from 5 minutes. Fixes #411. --- other/travis/toxcore-script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script index 758d343087..2154d55856 100755 --- a/other/travis/toxcore-script +++ b/other/travis/toxcore-script @@ -30,7 +30,7 @@ RUN $CMAKE \ -DASAN=ON \ -DDEBUG=ON \ -DSTRICT_ABI=ON \ - -DTEST_TIMEOUT_SECONDS=300 \ + -DTEST_TIMEOUT_SECONDS=120 \ -DTRACE=ON \ $CMAKE_EXTRA_FLAGS From c780d25e3e08267f9c225f8d576892f771db801e Mon Sep 17 00:00:00 2001 From: iphydf Date: Sun, 26 Mar 2017 16:15:36 +0000 Subject: [PATCH 2/2] Retry autotools tests the same way as cmake tests. --- other/travis/autotools-script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/travis/autotools-script b/other/travis/autotools-script index 026967b7e0..d97b15b331 100755 --- a/other/travis/autotools-script +++ b/other/travis/autotools-script @@ -21,4 +21,4 @@ make -j$NPROC -k # This runs `make check` with the default configure flags, not with the ones # above. -make distcheck -j$NPROC -k +TESTS $MAX_TEST_RETRIES make distcheck -j$NPROC -k