From a11ff3755aa18e39fe67359ffba12c241f3f78d3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 1 Nov 2018 09:49:43 +0000 Subject: [PATCH 1/3] meson: Centralize test timeout values Signed-off-by: Simon McVittie --- gio/tests/meson.build | 2 +- glib/tests/meson.build | 2 +- gobject/tests/meson.build | 2 +- meson.build | 2 ++ tests/gobject/meson.build | 2 +- tests/meson.build | 2 +- tests/refcount/meson.build | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 1556464b7..a38801118 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -484,7 +484,7 @@ foreach test_dict : gio_tests ) suite = ['gio'] + extra_args.get('suite', []) - timeout = suite.contains('slow') ? 120 : 30 + timeout = suite.contains('slow') ? test_timeout_slow : test_timeout test(test_name, exe, env : test_env, timeout : timeout, diff --git a/glib/tests/meson.build b/glib/tests/meson.build index 2468d8767..7903783a9 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -186,7 +186,7 @@ foreach test_name, extra_args : glib_tests ) suite = ['glib'] + extra_args.get('suite', []) - timeout = suite.contains('slow') ? 120 : 30 + timeout = suite.contains('slow') ? test_timeout_slow : test_timeout test(test_name, exe, env : test_env, timeout : timeout, suite : suite, args : ['--tap']) endif diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build index 124f4923e..51571c076 100644 --- a/gobject/tests/meson.build +++ b/gobject/tests/meson.build @@ -89,7 +89,7 @@ foreach test_name, extra_args : gobject_tests ) suite = ['gobject'] + extra_args.get('suite', []) - timeout = suite.contains('slow') ? 120 : 30 + timeout = suite.contains('slow') ? test_timeout_slow : test_timeout test(test_name, exe, env : test_env, timeout : timeout, suite : suite, args: ['--tap']) endforeach diff --git a/meson.build b/meson.build index 2ba3cb052..594f55c93 100644 --- a/meson.build +++ b/meson.build @@ -1962,6 +1962,8 @@ if want_systemtap and enable_dtrace enable_systemtap = true endif +test_timeout = 30 +test_timeout_slow = 120 pkg = import('pkgconfig') windows = import('windows') diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build index 2a58766df..43ad6ac9c 100644 --- a/tests/gobject/meson.build +++ b/tests/gobject/meson.build @@ -86,7 +86,7 @@ foreach test_dict : gobject_tests ) suite = ['gobject'] + extra_args.get('suite', []) - timeout = suite.contains('slow') ? 120 : 30 + timeout = suite.contains('slow') ? test_timeout_slow : test_timeout # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset test(test_name, exe, env : test_env, timeout : timeout, suite : suite, args : test_command_args) diff --git a/tests/meson.build b/tests/meson.build index 778d20ce3..80e45d7a2 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -127,7 +127,7 @@ foreach test_dict : tests ) suite = ['glib'] + extra_args.get('suite', []) - timeout = suite.contains('slow') ? 120 : 30 + timeout = suite.contains('slow') ? test_timeout_slow : test_timeout # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset test(test_name, exe, env : test_env, timeout : timeout, suite : suite, args : test_command_args) diff --git a/tests/refcount/meson.build b/tests/refcount/meson.build index 3a2072d08..68c23cc41 100644 --- a/tests/refcount/meson.build +++ b/tests/refcount/meson.build @@ -53,7 +53,7 @@ foreach test_name, extra_args : refcount_tests ) suite = ['refcount'] + extra_args.get('suite', []) - timeout = suite.contains('slow') ? 120 : 30 + timeout = suite.contains('slow') ? test_timeout_slow : test_timeout # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset test(test_name, exe, env : test_env, timeout : timeout, suite : suite) endforeach From 149c7504d8f57f4d64890df5e8a9150be60ec425 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 1 Nov 2018 09:38:40 +0000 Subject: [PATCH 2/3] meson: Increase fast test timeout from 30s to 60s This is enough for most Debian buildds, including embedded devices like mips and powerpcspe. It is not enough for hppa (PA-RISC), but that architecture is so uniquely slow that it might make more sense to special-case it downstream. Signed-off-by: Simon McVittie --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 594f55c93..14e72de57 100644 --- a/meson.build +++ b/meson.build @@ -1962,7 +1962,7 @@ if want_systemtap and enable_dtrace enable_systemtap = true endif -test_timeout = 30 +test_timeout = 60 test_timeout_slow = 120 pkg = import('pkgconfig') From b1af125677b77d4ac1ff8fb9c2faf7a870db41c4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 1 Nov 2018 19:03:16 +0000 Subject: [PATCH 3/3] meson: Mark gdatetime test as slow This test isn't inherently slow, but it produces so much output that it can take a minute or more on hardware with weak I/O performance. Signed-off-by: Simon McVittie --- glib/tests/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glib/tests/meson.build b/glib/tests/meson.build index 7903783a9..d7b6a7a4c 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -23,7 +23,9 @@ glib_tests = { 'environment' : {}, 'error' : {}, 'fileutils' : {}, - 'gdatetime' : {}, + 'gdatetime' : { + 'suite' : ['slow'], + }, 'guuid' : {}, 'gvariant' : { 'suite' : ['slow'],