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

tests: Rework slow test handling for GIO tests

Browse Source 
Make it follow the same pattern as in glib/tests/meson.build, using a
slow_tests array.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2018-07-05 17:14:53 +01:00
parent cf4f6d4808
commit cfc26b5a41
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/tests/meson.build
View File

@ -65,6 +65,11 @@ gio_tests = [
'testfilemonitor', 'testfilemonitor',
'thumbnail-verification', 'thumbnail-verification',
] ]
slow_tests = [
'actions',
'gdbus-export',
'testfilemonitor',
]
test_extra_programs = [ test_extra_programs = [
['gdbus-connection-flush-helper'], ['gdbus-connection-flush-helper'],
@ -210,8 +215,9 @@ if host_machine.system() != 'windows'
install : false, install : false,
c_args : test_c_args, c_args : test_c_args,
dependencies : common_gio_tests_deps + extra_deps) dependencies : common_gio_tests_deps + extra_deps)
if test_name == 'actions' or test_name == 'gdbus-export' # These tests may take more than 30 seconds to run on the CI infrastructure
test(test_name, exe, env : test_env, timeout : 45, suite : ['gio', 'slow']) if slow_tests.contains(test_name)
test(test_name, exe, env : test_env, timeout : 120, suite : ['gio', 'slow'])
else else
test(test_name, exe, env : test_env, suite : ['gio']) test(test_name, exe, env : test_env, suite : ['gio'])
endif endif
@ -302,8 +308,9 @@ foreach test_name : gio_tests
install : false, install : false,
c_args : test_c_args, c_args : test_c_args,
dependencies : common_gio_tests_deps + extra_deps) dependencies : common_gio_tests_deps + extra_deps)
if test_name == 'testfilemonitor' # These tests may take more than 30 seconds to run on the CI infrastructure
test(test_name, exe, env : test_env, timeout : 45, suite : ['gio', 'slow']) if slow_tests.contains(test_name)
test(test_name, exe, env : test_env, timeout : 120, suite : ['gio', 'slow'])
else else
test(test_name, exe, env : test_env, suite : ['gio']) test(test_name, exe, env : test_env, suite : ['gio'])
endif endif