forked from enlightenment/efl
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>
This commit is contained in:
parent
3bd210fbf9
commit
e6ca452832
|
@ -22,16 +22,12 @@ NUM_TRIES=5
|
||||||
|
|
||||||
travis_fold check "ninja test"
|
travis_fold check "ninja test"
|
||||||
if [ "$DISTRO" != "" ] ; then
|
if [ "$DISTRO" != "" ] ; then
|
||||||
# disable them for this distros, after meson 0.49 is out, this can be removed
|
for tries in $(seq 1 ${NUM_TRIES}); do
|
||||||
# https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
|
(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
|
||||||
if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
|
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
|
||||||
for tries in $(seq 1 ${NUM_TRIES}); do
|
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
|
||||||
(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
|
false
|
||||||
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
|
done
|
||||||
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
|
|
||||||
false
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
ret=$?
|
ret=$?
|
||||||
travis_endfold check
|
travis_endfold check
|
||||||
|
|
Loading…
Reference in New Issue