summaryrefslogtreecommitdiff
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
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
-rwxr-xr-x.ci/ci-make-check.sh2
-rw-r--r--src/benchmarks/eina/meson.build1
-rw-r--r--src/benchmarks/elementary/meson.build1
-rw-r--r--src/tests/ecore/meson.build2
-rw-r--r--src/tests/ecore_cxx/meson.build1
-rw-r--r--src/tests/eet_cxx/meson.build1
-rw-r--r--src/tests/eina/meson.build1
-rw-r--r--src/tests/eina_cxx/meson.build1
-rw-r--r--src/tests/eio/meson.build2
-rw-r--r--src/tests/eldbus/meson.build1
-rw-r--r--src/tests/eldbus_cxx/meson.build1
-rw-r--r--src/tests/elua/meson.build1
-rw-r--r--src/tests/eo_cxx/meson.build1
-rw-r--r--src/tests/eolian/meson.build1
-rw-r--r--src/tests/eolian_cxx/meson.build1
15 files changed, 2 insertions, 16 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
diff --git a/src/benchmarks/eina/meson.build b/src/benchmarks/eina/meson.build
index 34c75b7ca0..9b924dd1b9 100644
--- a/src/benchmarks/eina/meson.build
+++ b/src/benchmarks/eina/meson.build
@@ -38,5 +38,4 @@ eina_bench = executable('eina_bench',
38 38
39benchmark('eina_bench', eina_bench, 39benchmark('eina_bench', eina_bench,
40 args : 'libcity.la', 40 args : 'libcity.la',
41 timeout : 20*60
42) 41)
diff --git a/src/benchmarks/elementary/meson.build b/src/benchmarks/elementary/meson.build
index 158a535ae2..206ea06e4b 100644
--- a/src/benchmarks/elementary/meson.build
+++ b/src/benchmarks/elementary/meson.build
@@ -5,5 +5,4 @@ focus_widget_tree_bench = executable('focus_widget_tree_bench',
5 5
6benchmark('focus_widget_tree', focus_widget_tree_bench, 6benchmark('focus_widget_tree', focus_widget_tree_bench,
7 args: ['5'], 7 args: ['5'],
8 timeout : 5*60
9) 8)
diff --git a/src/tests/ecore/meson.build b/src/tests/ecore/meson.build
index c49d941355..9ce6848ce2 100644
--- a/src/tests/ecore/meson.build
+++ b/src/tests/ecore/meson.build
@@ -109,11 +109,9 @@ efl_app_suite = executable('efl_app_suite',
109) 109)
110 110
111test('ecore-suite', ecore_suite, 111test('ecore-suite', ecore_suite,
112 timeout : 10*60,
113 env : test_env 112 env : test_env
114) 113)
115 114
116test('efl-app', efl_app_suite, 115test('efl-app', efl_app_suite,
117 timeout : 10*60,
118 env : test_env 116 env : test_env
119) 117)
diff --git a/src/tests/ecore_cxx/meson.build b/src/tests/ecore_cxx/meson.build
index 75547f1258..9c88552418 100644
--- a/src/tests/ecore_cxx/meson.build
+++ b/src/tests/ecore_cxx/meson.build
@@ -24,6 +24,5 @@ executable('ecore_cxx_suite_compile_test',
24) 24)
25 25
26test('ecore_cxx-suite', ecore_cxx_suite, 26test('ecore_cxx-suite', ecore_cxx_suite,
27 timeout : 10*60,
28 env : test_env 27 env : test_env
29) 28)
diff --git a/src/tests/eet_cxx/meson.build b/src/tests/eet_cxx/meson.build
index f3f3fb8046..9b5b1b0145 100644
--- a/src/tests/eet_cxx/meson.build
+++ b/src/tests/eet_cxx/meson.build
@@ -16,6 +16,5 @@ eet_cxx_suite = executable('eet_cxx_suite',
16 16
17 17
18test('ecore_cxx-suite', eet_cxx_suite, 18test('ecore_cxx-suite', eet_cxx_suite,
19 timeout : 10*60,
20 env : test_env 19 env : test_env
21) 20)
diff --git a/src/tests/eina/meson.build b/src/tests/eina/meson.build
index f111e3a12d..b6ba688e8b 100644
--- a/src/tests/eina/meson.build
+++ b/src/tests/eina/meson.build
@@ -69,5 +69,4 @@ eina_test_exe = executable('eina_suite',
69 69
70test('eina', eina_test_exe, 70test('eina', eina_test_exe,
71 env : test_env, 71 env : test_env,
72 timeout : 5*60
73) 72)
diff --git a/src/tests/eina_cxx/meson.build b/src/tests/eina_cxx/meson.build
index 726e01d034..facad4a9af 100644
--- a/src/tests/eina_cxx/meson.build
+++ b/src/tests/eina_cxx/meson.build
@@ -50,6 +50,5 @@ eina_cxx_suite = executable('eina_cxx_suite',
50) 50)
51 51
52test('eina_cxx-suite', eina_cxx_suite, 52test('eina_cxx-suite', eina_cxx_suite,
53 timeout : 10*60,
54 env : test_env 53 env : test_env
55) 54)
diff --git a/src/tests/eio/meson.build b/src/tests/eio/meson.build
index 516ac2417d..4ae10236ee 100644
--- a/src/tests/eio/meson.build
+++ b/src/tests/eio/meson.build
@@ -26,5 +26,5 @@ eio_suite = executable('eio_suite',
26 26
27test('eio-suite', eio_suite, 27test('eio-suite', eio_suite,
28 env : test_env, 28 env : test_env,
29 timeout : 10*60 #10 min. can be realistic, this testsuite is slow! 29 timeout : 120
30) 30)
diff --git a/src/tests/eldbus/meson.build b/src/tests/eldbus/meson.build
index f5b8319824..565c9ce7fb 100644
--- a/src/tests/eldbus/meson.build
+++ b/src/tests/eldbus/meson.build
@@ -29,5 +29,4 @@ eldbus_suite = executable('eldbus_suite',
29 29
30test('eldbus-suite', eldbus_suite, 30test('eldbus-suite', eldbus_suite,
31 env : test_env, 31 env : test_env,
32 timeout : 60
33) 32)
diff --git a/src/tests/eldbus_cxx/meson.build b/src/tests/eldbus_cxx/meson.build
index e3e04e5290..23b955958f 100644
--- a/src/tests/eldbus_cxx/meson.build
+++ b/src/tests/eldbus_cxx/meson.build
@@ -16,6 +16,5 @@ eldbus_cxx_suite = executable('eldbus_cxx_suite',
16) 16)
17 17
18test('eldbus_cxx-suite', eldbus_cxx_suite, 18test('eldbus_cxx-suite', eldbus_cxx_suite,
19 timeout : 10*60,
20 env : test_env 19 env : test_env
21) 20)
diff --git a/src/tests/elua/meson.build b/src/tests/elua/meson.build
index ec75f672b1..22174f0bb0 100644
--- a/src/tests/elua/meson.build
+++ b/src/tests/elua/meson.build
@@ -26,6 +26,5 @@ elua_suite = executable('elua_suite',
26) 26)
27 27
28test('elua-suite', elua_suite, 28test('elua-suite', elua_suite,
29 timeout : 10*60,
30 env : test_env 29 env : test_env
31) 30)
diff --git a/src/tests/eo_cxx/meson.build b/src/tests/eo_cxx/meson.build
index 43e487da57..eaacac6a17 100644
--- a/src/tests/eo_cxx/meson.build
+++ b/src/tests/eo_cxx/meson.build
@@ -15,6 +15,5 @@ eo_cxx_suite = executable('eo_cxx_suite',
15) 15)
16 16
17test('eo_cxx-suite', eo_cxx_suite, 17test('eo_cxx-suite', eo_cxx_suite,
18 timeout : 10*60,
19 env : test_env 18 env : test_env
20) 19)
diff --git a/src/tests/eolian/meson.build b/src/tests/eolian/meson.build
index a9f569dfd1..f4b6cdc6f1 100644
--- a/src/tests/eolian/meson.build
+++ b/src/tests/eolian/meson.build
@@ -36,6 +36,5 @@ eolian_suite = executable('eolian_suite',
36) 36)
37 37
38test('eolian', eolian_suite, 38test('eolian', eolian_suite,
39 timeout: 30,
40 env : test_env 39 env : test_env
41) 40)
diff --git a/src/tests/eolian_cxx/meson.build b/src/tests/eolian_cxx/meson.build
index aa1c5677cb..23b2727eaf 100644
--- a/src/tests/eolian_cxx/meson.build
+++ b/src/tests/eolian_cxx/meson.build
@@ -69,6 +69,5 @@ eolian_cxx_suite = executable('eolian_cxx_suite',
69) 69)
70 70
71test('eolian_cxx-suite', eolian_cxx_suite, 71test('eolian_cxx-suite', eolian_cxx_suite,
72 timeout : 10*60,
73 env : test_env 72 env : test_env
74) 73)