luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-14 06:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2-58-test-timeout' into 'glib-2-58'

Browse Source 
[2.58] meson: Increase test timeouts

See merge request GNOME/glib!445
This commit is contained in:
Philip Withnall 2018-11-02 10:43:52 +00:00
commit 7aa52a7d53
7 changed files with 11 additions and 7 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', [])
timeout = suite.contains('slow') ? 120 : 30
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
test(test_name, exe,
env : test_env,
timeout : timeout,

6
glib/tests/meson.build
View File

@ -23,7 +23,9 @@ glib_tests = {
'environment' : {},
'error' : {},
'fileutils' : {},
'gdatetime' : {},
'gdatetime' : {
'suite' : ['slow'],
},
'guuid' : {},
'gvariant' : {
'suite' : ['slow'],
@ -186,7 +188,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

2
gobject/tests/meson.build
View File

@ -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

2
meson.build
View File

@ -1962,6 +1962,8 @@ if want_systemtap and enable_dtrace
enable_systemtap = true
endif
test_timeout = 60
test_timeout_slow = 120
pkg = import('pkgconfig')
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', [])
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)

2
tests/meson.build
View File

@ -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)

2
tests/refcount/meson.build
View File

@ -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