summaryrefslogtreecommitdiff
path: root/.ci/ci-make-check.sh
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-05-15 12:44:27 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-05-15 18:49:51 +0200
commit7c7998b3dccc27fcee10668bb05c4e8d4e28c537 (patch)
treeedafdebab96a2dd558f3cdf2cf331f10b4b14b45 /.ci/ci-make-check.sh
parentf417fb26e88c10afec74a09a3f0b93b97c143b48 (diff)
meson: enforce 61s timeout for tests, remove explicit timeouts from build files
unit tests automatically abort with info after 60s, and tests should be run with an appropriate timeout to avoid conflict with the test runner's default 30s timeout set explicit timeout in eio test for now because there's still frequent bugs here Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D8894
Diffstat (limited to '.ci/ci-make-check.sh')
-rwxr-xr-x.ci/ci-make-check.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 762cf70774..ff8f5e0894 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -23,7 +23,7 @@ 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 EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -C build --wrapper dbus-launch ) && break 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 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt 27 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
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