From f9e8839125f3892e14022cc2644274f5d2514138 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Tue, 9 Jan 2024 08:14:42 +0000
Subject: [PATCH] tests - let's have our own enforced master timeout of 240sec

let's not let check defaults decide. let us decide for everything with
one var. also timeout.c matches too... so 2 places i guess for now.
---
 src/tests/ecore/meson.build           | 6 ++++--
 src/tests/ecore_con/meson.build       | 3 ++-
 src/tests/ecore_wl2/meson.build       | 3 ++-
 src/tests/edje/meson.build            | 3 ++-
 src/tests/eet/meson.build             | 3 ++-
 src/tests/eeze/meson.build            | 3 ++-
 src/tests/efl/meson.build             | 3 ++-
 src/tests/efreet/meson.build          | 3 ++-
 src/tests/eina/meson.build            | 1 +
 src/tests/eio/meson.build             | 2 +-
 src/tests/eldbus/meson.build          | 1 +
 src/tests/elementary/meson.build      | 6 ++++--
 src/tests/elementary/spec/meson.build | 2 +-
 src/tests/emile/meson.build           | 3 ++-
 src/tests/eo/suite/meson.build        | 9 ++++++---
 src/tests/evas/meson.build            | 2 +-
 src/tests/meson.build                 | 1 +
 src/tests/timeout.c                   | 2 +-
 18 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/tests/ecore/meson.build b/src/tests/ecore/meson.build
index 48c9350638..e30b944148 100644
--- a/src/tests/ecore/meson.build
+++ b/src/tests/ecore/meson.build
@@ -110,9 +110,11 @@ efl_app_suite = executable('efl_app_suite',
 )
 
 test('ecore-suite', ecore_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
 
 test('efl-app', efl_app_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/ecore_con/meson.build b/src/tests/ecore_con/meson.build
index 0b8bd78909..a4f8dffbc4 100644
--- a/src/tests/ecore_con/meson.build
+++ b/src/tests/ecore_con/meson.build
@@ -16,5 +16,6 @@ ecore_con_suite = executable('ecore_con_suite',
 )
 
 test('ecore_con-suite', ecore_con_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/ecore_wl2/meson.build b/src/tests/ecore_wl2/meson.build
index f7472d02ed..5ab6880872 100644
--- a/src/tests/ecore_wl2/meson.build
+++ b/src/tests/ecore_wl2/meson.build
@@ -27,5 +27,6 @@ ecore_wl2_suite = executable('ecore_wl2_suite',
 )
 
 test('ecore_wl2-suite', ecore_wl2_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/edje/meson.build b/src/tests/edje/meson.build
index 668f1b0d35..3f9a70e3b1 100644
--- a/src/tests/edje/meson.build
+++ b/src/tests/edje/meson.build
@@ -25,5 +25,6 @@ edje_suite = executable('edje_suite',
 )
 
 test('edje-suite', edje_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/eet/meson.build b/src/tests/eet/meson.build
index 2e3b2808ce..1ddf518667 100644
--- a/src/tests/eet/meson.build
+++ b/src/tests/eet/meson.build
@@ -23,5 +23,6 @@ eet_suite = executable('eet_suite',
 )
 
 test('eet-suite', eet_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/eeze/meson.build b/src/tests/eeze/meson.build
index d4e5430b96..540a077d63 100644
--- a/src/tests/eeze/meson.build
+++ b/src/tests/eeze/meson.build
@@ -16,5 +16,6 @@ eeze_suite = executable('eeze_suite',
 )
 
 test('eeze-suite', eeze_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/efl/meson.build b/src/tests/efl/meson.build
index aba64ac2f3..b3ba6b3eb2 100644
--- a/src/tests/efl/meson.build
+++ b/src/tests/efl/meson.build
@@ -14,5 +14,6 @@ efl_suite_bin = executable('efl_suite',
 )
 
 test('efl-suite', efl_suite_bin,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/efreet/meson.build b/src/tests/efreet/meson.build
index 24364523f5..5db07c5ce8 100644
--- a/src/tests/efreet/meson.build
+++ b/src/tests/efreet/meson.build
@@ -15,7 +15,8 @@ efreet_suite = executable('efreet_suite',
 )
 
 test('efreet-suite', efreet_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
 
 efreet_test_src = [
diff --git a/src/tests/eina/meson.build b/src/tests/eina/meson.build
index 0d09819e74..6195515e36 100644
--- a/src/tests/eina/meson.build
+++ b/src/tests/eina/meson.build
@@ -72,4 +72,5 @@ eina_test_exe = executable('eina_suite',
 
 test('eina', eina_test_exe,
   env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/eio/meson.build b/src/tests/eio/meson.build
index 4ae10236ee..df082356a7 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 : 120
+  timeout : master_timeout
 )
diff --git a/src/tests/eldbus/meson.build b/src/tests/eldbus/meson.build
index 565c9ce7fb..950e72d006 100644
--- a/src/tests/eldbus/meson.build
+++ b/src/tests/eldbus/meson.build
@@ -29,4 +29,5 @@ eldbus_suite = executable('eldbus_suite',
 
 test('eldbus-suite', eldbus_suite,
   env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 273ee418dc..90249fda9d 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -193,11 +193,13 @@ executable('efl_ui_window_cnp_dnd_slave',
 )
 
 test('elementary-suite', elementary_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
 
 test('efl-ui-suite', efl_ui_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
 
 install_data(files(['testdiff.diff', 'testfile-windows.txt', 'testfile-withblanks.txt', 'testfile.txt']),
diff --git a/src/tests/elementary/spec/meson.build b/src/tests/elementary/spec/meson.build
index e0a5a3c86d..2ec21f5908 100644
--- a/src/tests/elementary/spec/meson.build
+++ b/src/tests/elementary/spec/meson.build
@@ -45,5 +45,5 @@ efl_ui_behavior_suite = executable('efl_ui_spec_suite',
 
 test('efl_ui_spec-suite', efl_ui_behavior_suite,
   env : test_env,
-  timeout: 60
+  timeout: master_timeout
 )
diff --git a/src/tests/emile/meson.build b/src/tests/emile/meson.build
index 438989a374..47fb236e52 100644
--- a/src/tests/emile/meson.build
+++ b/src/tests/emile/meson.build
@@ -14,5 +14,6 @@ emile_suite = executable('emile_suite',
 )
 
 test('emile-suite', emile_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/eo/suite/meson.build b/src/tests/eo/suite/meson.build
index 3edd5f33b4..a0249c5c8a 100644
--- a/src/tests/eo/suite/meson.build
+++ b/src/tests/eo/suite/meson.build
@@ -30,7 +30,8 @@ eo_suite = executable('eo_suite',
 )
 
 test('eo-suite', eo_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
 
 eo_suite = executable('eo_suite_dbg',
@@ -43,7 +44,8 @@ eo_suite = executable('eo_suite_dbg',
 )
 
 test('eo-suite-dbg', eo_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
 
 eo_suite = executable('eo_suite_fallback',
@@ -57,5 +59,6 @@ eo_suite = executable('eo_suite_fallback',
 )
 
 test('eo-suite-fallback', eo_suite,
-  env : test_env
+  env : test_env,
+  timeout : master_timeout
 )
diff --git a/src/tests/evas/meson.build b/src/tests/evas/meson.build
index 01681ffb1d..0a3b49e1ed 100644
--- a/src/tests/evas/meson.build
+++ b/src/tests/evas/meson.build
@@ -35,5 +35,5 @@ evas_suite = executable('evas_suite',
 
 test('evas-suite', evas_suite,
   env : test_env,
-  timeout: 60,
+  timeout : master_timeout
 )
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 7604ba199a..58bcd0918d 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1 +1,2 @@
+master_timeout = 240
 executable('timeout', 'timeout.c')
diff --git a/src/tests/timeout.c b/src/tests/timeout.c
index de881535c1..90697025b0 100644
--- a/src/tests/timeout.c
+++ b/src/tests/timeout.c
@@ -10,6 +10,6 @@
 int
 main(int arc, char *argv[])
 {
-   sleep(60);
+   sleep(240);
    return 0;
 }