From 1dabc4970a65c0ea60a0fc8966376704ec247e9a Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Sun, 2 Dec 2018 11:15:47 +0100 Subject: [PATCH] ci: disable testing on ubuntu and debian it appears that there is a bug in meson (which is fixed upstream). For now this disables the tests, it can be reverted later once 0.49 is released. This fixes the cron job for 2 jobs. Differential Revision: https://phab.enlightenment.org/D7410 --- .ci/ci-make-check.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh index 1744b4894c..6dff663e69 100755 --- a/.ci/ci-make-check.sh +++ b/.ci/ci-make-check.sh @@ -19,12 +19,16 @@ NUM_TRIES=5 travis_fold check "make check-TESTS" if [ "$BUILDSYSTEM" = "ninja" ] ; then if [ "$DISTRO" != "" ] ; then - for tries in $(seq 1 ${NUM_TRIES}); do - (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build test) && 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 - false - done + # disable them for this distros, after meson 0.49 is out, this can be removed + # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be + if [ "$DISTRO" != "Ubuntu1804" ] && [ "$DISTRO" != "Debian91" ]; then + for tries in $(seq 1 ${NUM_TRIES}); do + (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build test) && 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 + false + done + fi fi else if [ "$DISTRO" != "" ] ; then