aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2018-09-14 13:40:10 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2018-09-14 13:40:10 +0200
commit87baae98454a85753940a343e62d6277b3922f3d (patch)
treed855642630a04a82052b48a5a0eb98821c53f4bf
parentci: run tests up to 5 times before failing (diff)
downloadefl-devs/stefan/review2.tar.gz
Revert "ci: run tests up to 5 times before failing"devs/stefan/review2
-rwxr-xr-x.ci/ci-make-check.sh6
-rwxr-xr-x.ci/distcheck.sh5
2 files changed, 4 insertions, 7 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index edb1752810..4ecf5b5a38 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -10,14 +10,12 @@ if [ "$1" = "misc" ] || [ "$1" = "misc-disabled" ] ; then
exit 0
fi
-NUM_TRIES=5
-
travis_fold check "make check-TESTS"
if [ "$DISTRO" != "" ] ; then
- for tries in $(seq 1 ${NUM_TRIES}); do
+ for tries in 1 2 3 ; do
(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
docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
- if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
+ if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi
false
done
#else
diff --git a/.ci/distcheck.sh b/.ci/distcheck.sh
index 8c8e7cdf97..afc4fe1835 100755
--- a/.ci/distcheck.sh
+++ b/.ci/distcheck.sh
@@ -70,11 +70,10 @@ travis_endfold check-build
travis_fold check-TESTS check-TESTS
set +e
export EINA_LOG_BACKTRACE="0"
-NUM_TRIES=5
-for tries in $(seq 1 ${NUM_TRIES}); do
+for tries in 1 2 3 ; do
make ${AM_MAKEFLAGS} -C src/ -j1 check-TESTS && break
cat src/test-suite.log
- if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; continue ; fi
+ if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; continue ; fi
exit 1
done
travis_endfold check-TESTS