summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-11-15 09:24:48 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-11-17 11:44:54 +0100
commite6ca452832b60fb16043677a9a750f0ec57eec8f (patch)
treef14ae8ae6f9d2922fcf01038cabfe50427148545
parent3bd210fbf90589101a84eff08d766276bd1755fb (diff)
ci: cleanup the check for old meson versions
We install the newest version via pip on our CI docker images. No longer need to check for this. Differential Revision: https://phab.enlightenment.org/D10681 Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>
-rwxr-xr-x.ci/ci-make-check.sh16
1 files changed, 6 insertions, 10 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 36f1f2de58..1578b3cb65 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -22,16 +22,12 @@ NUM_TRIES=5
22 22
23travis_fold check "ninja test" 23travis_fold check "ninja test"
24if [ "$DISTRO" != "" ] ; then 24if [ "$DISTRO" != "" ] ; then
25 # disable them for this distros, after meson 0.49 is out, this can be removed 25 for tries in $(seq 1 ${NUM_TRIES}); do
26 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be 26 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
27 if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then 27 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
28 for tries in $(seq 1 ${NUM_TRIES}); do 28 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
29 (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break 29 false
30 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt 30 done
31 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
32 false
33 done
34 fi
35fi 31fi
36ret=$? 32ret=$?
37travis_endfold check 33travis_endfold check