diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-28 11:26:55 -0400 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-03-29 12:34:35 +0100 |
commit | f397f53a2a03eed606908850bb82e8c864ef7192 (patch) | |
tree | fe6c92849e7d5091d2941c73e99b13330b24fce7 /.ci | |
parent | d3bb1a7342b2725c585d90557926e0c433058e50 (diff) |
ci: use meson test runner with ninja build and use dbus in tests
this fixes dbus usage in tests
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D8503
Diffstat (limited to '.ci')
-rwxr-xr-x | .ci/ci-make-check.sh | 4 |
1 files 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 | |||
23 | # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be | 23 | # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be |
24 | if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then | 24 | if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then |
25 | for tries in $(seq 1 ${NUM_TRIES}); do | 25 | for tries in $(seq 1 ${NUM_TRIES}); do |
26 | (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build test) && break | 26 | (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -C build --wrapper dbus-launch ) && break |
27 | docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log | 27 | docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log |
28 | if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi | 28 | if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi |
29 | false | 29 | false |
30 | done | 30 | done |