summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/ci-make-check.sh6
-rwxr-xr-x.ci/distcheck.sh5
2 files changed, 7 insertions, 4 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 4ecf5b5a38..edb1752810 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -10,12 +10,14 @@ if [ "$1" = "misc" ] || [ "$1" = "misc-disabled" ] ; then
10 exit 0 10 exit 0
11fi 11fi
12 12
13NUM_TRIES=5
14
13travis_fold check "make check-TESTS" 15travis_fold check "make check-TESTS"
14if [ "$DISTRO" != "" ] ; then 16if [ "$DISTRO" != "" ] ; then
15 for tries in 1 2 3 ; do 17 for tries in $(seq 1 ${NUM_TRIES}); do
16 (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break 18 (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break
17 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log 19 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
18 if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi 20 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
19 false 21 false
20 done 22 done
21#else 23#else
diff --git a/.ci/distcheck.sh b/.ci/distcheck.sh
index afc4fe1835..8c8e7cdf97 100755
--- a/.ci/distcheck.sh
+++ b/.ci/distcheck.sh
@@ -70,10 +70,11 @@ travis_endfold check-build
70travis_fold check-TESTS check-TESTS 70travis_fold check-TESTS check-TESTS
71set +e 71set +e
72export EINA_LOG_BACKTRACE="0" 72export EINA_LOG_BACKTRACE="0"
73for tries in 1 2 3 ; do 73NUM_TRIES=5
74for tries in $(seq 1 ${NUM_TRIES}); do
74 make ${AM_MAKEFLAGS} -C src/ -j1 check-TESTS && break 75 make ${AM_MAKEFLAGS} -C src/ -j1 check-TESTS && break
75 cat src/test-suite.log 76 cat src/test-suite.log
76 if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; continue ; fi 77 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; continue ; fi
77 exit 1 78 exit 1
78done 79done
79travis_endfold check-TESTS 80travis_endfold check-TESTS