mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-26 12:12:10 +01:00
Merge branch 'test-timeout' into 'master'
meson: Increase test timeouts See merge request GNOME/glib!407
This commit is contained in:
commit
74d2a8e500
@ -493,7 +493,7 @@ foreach test_name, extra_args : 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,
|
||||
|
@ -20,7 +20,9 @@ glib_tests = {
|
||||
'environment' : {},
|
||||
'error' : {},
|
||||
'fileutils' : {},
|
||||
'gdatetime' : {},
|
||||
'gdatetime' : {
|
||||
'suite' : ['slow'],
|
||||
},
|
||||
'guuid' : {},
|
||||
'gvariant' : {
|
||||
'suite' : ['slow'],
|
||||
@ -188,7 +190,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'])
|
||||
endforeach
|
||||
|
@ -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
|
||||
|
@ -1972,6 +1972,8 @@ if want_systemtap and enable_dtrace
|
||||
enable_systemtap = true
|
||||
endif
|
||||
|
||||
test_timeout = 60
|
||||
test_timeout_slow = 120
|
||||
|
||||
pkg = import('pkgconfig')
|
||||
windows = import('windows')
|
||||
|
@ -83,7 +83,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
|
||||
# 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)
|
||||
|
@ -124,7 +124,7 @@ foreach test_name, extra_args : 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)
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user