From 8bfedb57cc8f1f08de09071af66b9be03f051eae Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 19 Feb 2018 15:35:17 +0000 Subject: [PATCH] Increase the timeout for some GLib tests The CI infrastructure is shared and running inside a containerised environment, which means tests may take more time to finish on it than they would on a faster, personal machine. https://bugzilla.gnome.org/show_bug.cgi?id=793635 --- glib/tests/meson.build | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/glib/tests/meson.build b/glib/tests/meson.build index a78d9c057..5ff885170 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -98,6 +98,13 @@ test_env = [ test_cargs = ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib"'] +# Tests that consistently time out on the CI infrastructure +slow_tests = [ + 'gvariant', + 'sequence', + '642026', +] + foreach test_name : glib_tests deps = [libm, thread_dep, libglib_dep] if test_name == 'regex' @@ -108,7 +115,12 @@ foreach test_name : glib_tests dependencies : deps, install : false, ) - test(test_name, exe, env : test_env) + # These tests may take more than 30 seconds to run on the CI infrastructure + if slow_tests.contains(test_name) + test(test_name, exe, env : test_env, timeout : 90) + else + test(test_name, exe, env : test_env) + endif endforeach c_args_atomic = [] @@ -137,7 +149,7 @@ exe = executable('642026-ec', '642026.c', dependencies : deps, install : false, ) -test('642026-ec', exe, env : test_env) +test('642026-ec', exe, env : test_env, timeout : 45) exe = executable('1bit-emufutex', '1bit-mutex.c', c_args : test_cargs + ['-DTEST_EMULATED_FUTEX'],