luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-28 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: Centralize test timeout values

Browse Source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2018-11-01 09:49:43 +00:00 committed by Simon McVittie
parent 985210849c
commit a11ff3755a
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/meson.build
View File

@ -484,7 +484,7 @@ foreach test_dict : gio_tests
) )
suite = ['gio'] + extra_args.get('suite', []) 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, test(test_name, exe,
env : test_env, env : test_env,
timeout : timeout, timeout : timeout,

2
glib/tests/meson.build
View File

@ -186,7 +186,7 @@ foreach test_name, extra_args : glib_tests
) )
suite = ['glib'] + extra_args.get('suite', []) 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, test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : ['--tap']) args : ['--tap'])
endif endif

2
gobject/tests/meson.build
View File

@ -89,7 +89,7 @@ foreach test_name, extra_args : gobject_tests
) )
suite = ['gobject'] + extra_args.get('suite', []) 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, test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args: ['--tap']) args: ['--tap'])
endforeach endforeach

2
meson.build
View File

@ -1962,6 +1962,8 @@ if want_systemtap and enable_dtrace
enable_systemtap = true enable_systemtap = true
endif endif
test_timeout = 30
test_timeout_slow = 120
pkg = import('pkgconfig') pkg = import('pkgconfig')
windows = import('windows') windows = import('windows')

2
tests/gobject/meson.build
View File

@ -86,7 +86,7 @@ foreach test_dict : gobject_tests
) )
suite = ['gobject'] + extra_args.get('suite', []) 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 # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite, test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : test_command_args) args : test_command_args)

2
tests/meson.build
View File

@ -127,7 +127,7 @@ foreach test_dict : tests
) )
suite = ['glib'] + extra_args.get('suite', []) 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 # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite, test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : test_command_args) args : test_command_args)

2
tests/refcount/meson.build
View File

@ -53,7 +53,7 @@ foreach test_name, extra_args : refcount_tests
) )
suite = ['refcount'] + extra_args.get('suite', []) 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 # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite) test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach endforeach