From 7c7998b3dccc27fcee10668bb05c4e8d4e28c537 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@samsung.com>
Date: Wed, 15 May 2019 12:44:27 -0400
Subject: [PATCH] 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
---
 .ci/ci-make-check.sh                  | 2 +-
 src/benchmarks/eina/meson.build       | 1 -
 src/benchmarks/elementary/meson.build | 1 -
 src/tests/ecore/meson.build           | 2 --
 src/tests/ecore_cxx/meson.build       | 1 -
 src/tests/eet_cxx/meson.build         | 1 -
 src/tests/eina/meson.build            | 1 -
 src/tests/eina_cxx/meson.build        | 1 -
 src/tests/eio/meson.build             | 2 +-
 src/tests/eldbus/meson.build          | 1 -
 src/tests/eldbus_cxx/meson.build      | 1 -
 src/tests/elua/meson.build            | 1 -
 src/tests/eo_cxx/meson.build          | 1 -
 src/tests/eolian/meson.build          | 1 -
 src/tests/eolian_cxx/meson.build      | 1 -
 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
       # 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
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',
 
 benchmark('eina_bench', eina_bench,
   args : 'libcity.la',
-	timeout : 20*60
 )
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',
 
 benchmark('focus_widget_tree', focus_widget_tree_bench,
   args: ['5'],
-  timeout : 5*60
 )
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',
 )
 
 test('ecore-suite', ecore_suite,
-  timeout : 10*60,
   env : test_env
 )
 
 test('efl-app', efl_app_suite,
-  timeout : 10*60,
   env : test_env
 )
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',
 )
 
 test('ecore_cxx-suite', ecore_cxx_suite,
-  timeout : 10*60,
   env : test_env
 )
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',
 
 
 test('ecore_cxx-suite', eet_cxx_suite,
-  timeout : 10*60,
   env : test_env
 )
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',
 
 test('eina', eina_test_exe,
   env : test_env,
-	timeout : 5*60
 )
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',
 )
 
 test('eina_cxx-suite', eina_cxx_suite,
-  timeout : 10*60,
   env : test_env
 )
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',
 
 test('eio-suite', eio_suite,
   env : test_env,
-  timeout : 10*60 #10 min. can be realistic, this testsuite is slow!
+  timeout : 120
 )
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',
 
 test('eldbus-suite', eldbus_suite,
   env : test_env,
-  timeout : 60
 )
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',
 )
 
 test('eldbus_cxx-suite', eldbus_cxx_suite,
-  timeout : 10*60,
   env : test_env
 )
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',
 )
 
 test('elua-suite', elua_suite,
-  timeout : 10*60,
   env : test_env
 )
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',
 )
 
 test('eo_cxx-suite', eo_cxx_suite,
-  timeout : 10*60,
   env : test_env
 )
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',
 )
 
 test('eolian', eolian_suite,
-  timeout: 30,
   env : test_env
 )
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',
 )
 
 test('eolian_cxx-suite', eolian_cxx_suite,
-  timeout : 10*60,
   env : test_env
 )