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

Merge branch 'test-timeout' into 'master'

Browse Source 
meson: Increase test timeouts

See merge request GNOME/glib!407
This commit is contained in:
Philip Withnall 2018-11-02 11:02:32 +00:00
commit 74d2a8e500
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

@ -493,7 +493,7 @@ foreach test_name, extra_args : 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,

6
glib/tests/meson.build
View File

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

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

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

2
tests/gobject/meson.build
View File

@ -83,7 +83,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
# 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

@ -124,7 +124,7 @@ foreach test_name, extra_args : 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