luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-08 18:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1514-appinfo-test' into 'master'

Browse Source 
Meson: appinfo tests are racy if run in parallel

Closes #1514

See merge request GNOME/glib!356
This commit is contained in:
Xavier Claessens 2018-09-26 16:13:48 +00:00
commit 3b61570e06
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/tests/meson.build
View File

@ -145,9 +145,11 @@ if host_machine.system() != 'windows'
gio_tests += [{
'appinfo' : {
'install' : false,
'is_parallel' : false,
},
'desktop-app-info' : {
'install' : false,
'is_parallel' : false,
},
}]
endif
@ -480,8 +482,13 @@ foreach test_dict : gio_tests
suite = ['gio'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : ['--tap'])
test(test_name, exe,
env : test_env,
timeout : timeout,
suite : suite,
args : ['--tap'],
is_parallel : extra_args.get('is_parallel', true),
)
endforeach
endforeach