[glib/wip/3v1n0/support-can-fail-tests: 1/2] meson: Use default test multiplier to define timeouts




commit f8492c777c5e82c3c47ca1c051dc2821e1e8e999
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Thu Oct 20 03:16:30 2022 +0200

    meson: Use default test multiplier to define timeouts
    
    So that we don't have to care about the default, being always set to 1m

 meson.build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5e17ef0c74..14cfebd621 100644
--- a/meson.build
+++ b/meson.build
@@ -135,17 +135,19 @@ common_test_env = [
   'MALLOC_CHECK_=2',
 ]
 
-test_timeout = 60
-test_timeout_slow = 180
+test_timeout = 30
+test_timeout_slow = 90
 
 add_test_setup('default',
   is_default: true,
   exclude_suites: ['flaky', 'failing'],
   env: common_test_env,
+  timeout_multiplier: 2,
 )
 
 add_test_setup('unstable_tests',
   env: common_test_env,
+  timeout_multiplier: 2,
   # Empty test setup, used for having different results set for flaky tests
   # Sadly we can't use (https://github.com/mesonbuild/meson/issues/10934):
   #suites: ['flaky', 'unstable']
@@ -172,7 +174,7 @@ if valgrind.found()
         '@0@'.format(suppression_file[0])),
     ],
     env: common_test_env,
-    timeout_multiplier: 10,
+    timeout_multiplier: 20,
   )
 endif
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]