From 9e649debbe8970130f802edc828234bd4cb978db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 20 Oct 2022 03:16:30 +0200
Subject: [PATCH] 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 4ec76b9f6..3745509be 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 30aeb54f8..7147fa942 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