From f397f53a2a03eed606908850bb82e8c864ef7192 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 28 Mar 2019 11:26:55 -0400 Subject: [PATCH] ci: use meson test runner with ninja build and use dbus in tests this fixes dbus usage in tests Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D8503 --- .ci/ci-make-check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh index 8407e5a9bc..b5a8c5ac37 100755 --- a/.ci/ci-make-check.sh +++ b/.ci/ci-make-check.sh @@ -23,8 +23,8 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; 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 + (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -C build --wrapper dbus-launch ) && break + docker exec --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