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
This commit is contained in:
Mike Blumenkrantz 2019-05-15 12:44:27 -04:00 committed by Marcel Hollerbach
parent f417fb26e8
commit 7c7998b3dc
15 changed files with 2 additions and 16 deletions

View File

@ -23,7 +23,7 @@ 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 EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -C build --wrapper dbus-launch ) && break
(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
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
false

View File

@ -38,5 +38,4 @@ eina_bench = executable('eina_bench',
benchmark('eina_bench', eina_bench,
args : 'libcity.la',
timeout : 20*60
)

View File

@ -5,5 +5,4 @@ focus_widget_tree_bench = executable('focus_widget_tree_bench',
benchmark('focus_widget_tree', focus_widget_tree_bench,
args: ['5'],
timeout : 5*60
)

View File

@ -109,11 +109,9 @@ efl_app_suite = executable('efl_app_suite',
)
test('ecore-suite', ecore_suite,
timeout : 10*60,
env : test_env
)
test('efl-app', efl_app_suite,
timeout : 10*60,
env : test_env
)

View File

@ -24,6 +24,5 @@ executable('ecore_cxx_suite_compile_test',
)
test('ecore_cxx-suite', ecore_cxx_suite,
timeout : 10*60,
env : test_env
)

View File

@ -16,6 +16,5 @@ eet_cxx_suite = executable('eet_cxx_suite',
test('ecore_cxx-suite', eet_cxx_suite,
timeout : 10*60,
env : test_env
)

View File

@ -69,5 +69,4 @@ eina_test_exe = executable('eina_suite',
test('eina', eina_test_exe,
env : test_env,
timeout : 5*60
)

View File

@ -50,6 +50,5 @@ eina_cxx_suite = executable('eina_cxx_suite',
)
test('eina_cxx-suite', eina_cxx_suite,
timeout : 10*60,
env : test_env
)

View File

@ -26,5 +26,5 @@ eio_suite = executable('eio_suite',
test('eio-suite', eio_suite,
env : test_env,
timeout : 10*60 #10 min. can be realistic, this testsuite is slow!
timeout : 120
)

View File

@ -29,5 +29,4 @@ eldbus_suite = executable('eldbus_suite',
test('eldbus-suite', eldbus_suite,
env : test_env,
timeout : 60
)

View File

@ -16,6 +16,5 @@ eldbus_cxx_suite = executable('eldbus_cxx_suite',
)
test('eldbus_cxx-suite', eldbus_cxx_suite,
timeout : 10*60,
env : test_env
)

View File

@ -26,6 +26,5 @@ elua_suite = executable('elua_suite',
)
test('elua-suite', elua_suite,
timeout : 10*60,
env : test_env
)

View File

@ -15,6 +15,5 @@ eo_cxx_suite = executable('eo_cxx_suite',
)
test('eo_cxx-suite', eo_cxx_suite,
timeout : 10*60,
env : test_env
)

View File

@ -36,6 +36,5 @@ eolian_suite = executable('eolian_suite',
)
test('eolian', eolian_suite,
timeout: 30,
env : test_env
)

View File

@ -69,6 +69,5 @@ eolian_cxx_suite = executable('eolian_cxx_suite',
)
test('eolian_cxx-suite', eolian_cxx_suite,
timeout : 10*60,
env : test_env
)