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

[Marco Trevisan <marcotrevi src gnome org>]

commit 1359b08e1ceb88215f31901ca5cebaeec8e0014b
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

 .gitlab-ci.yml | 2 +-
 meson.build    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9d1244551..bab9461f58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
   COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
   DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v13"
   MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v9"
-  MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  MESON_TEST_TIMEOUT_MULTIPLIER: 4
   G_MESSAGES_DEBUG: all
   MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
 
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