luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: Use default test multiplier to define timeouts

Browse Source 
So that we don't have to care about the default, being always set to 1m
This commit is contained in:
Marco Trevisan (Treviño) 2022-10-20 03:16:30 +02:00
parent 3d497b8f5b
commit 9e649debbe
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -14,7 +14,7 @@ variables:
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v13" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v13"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v9" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v9"
MESON_TEST_TIMEOUT_MULTIPLIER: 2 MESON_TEST_TIMEOUT_MULTIPLIER: 4
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"

8
meson.build
View File

@ -135,17 +135,19 @@ common_test_env = [
'MALLOC_CHECK_=2', 'MALLOC_CHECK_=2',
] ]
test_timeout = 60 test_timeout = 30
test_timeout_slow = 180 test_timeout_slow = 90
add_test_setup('default', add_test_setup('default',
is_default: true, is_default: true,
exclude_suites: ['flaky', 'failing'], exclude_suites: ['flaky', 'failing'],
env: common_test_env, env: common_test_env,
timeout_multiplier: 2,
) )
add_test_setup('unstable_tests', add_test_setup('unstable_tests',
env: common_test_env, env: common_test_env,
timeout_multiplier: 2,
# Empty test setup, used for having different results set for flaky tests # Empty test setup, used for having different results set for flaky tests
# Sadly we can't use (https://github.com/mesonbuild/meson/issues/10934): # Sadly we can't use (https://github.com/mesonbuild/meson/issues/10934):
#suites: ['flaky', 'unstable'] #suites: ['flaky', 'unstable']
@ -172,7 +174,7 @@ if valgrind.found()
'@0@'.format(suppression_file[0])), '@0@'.format(suppression_file[0])),
], ],
env: common_test_env, env: common_test_env,
timeout_multiplier: 10, timeout_multiplier: 20,
) )
endif endif