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

installed-tests: Install the slow-connect-preload.so library and use it

Browse Source 
The gsocketclient-slow test needs this, otherwise connect() succeeds
immeidately and the test fails, because it is checking that cancellation
works. We weren't installing it for installed tests.
This commit is contained in:
Iain Lane 2019-02-12 11:36:05 +00:00
parent 07a1a8031d
commit 1ecaae6454
No known key found for this signature in database
GPG Key ID: E352D5C51C5041D4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/tests/meson.build
View File

@ -140,11 +140,16 @@ if host_machine.system() != 'windows'
'slow-connect-preload.c', 'slow-connect-preload.c',
name_prefix : '', name_prefix : '',
dependencies: cc.find_library('dl'), dependencies: cc.find_library('dl'),
install_dir : installed_tests_execdir,
install: installed_tests_enabled,
) )
], ],
'env' : { 'env' : {
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(meson.current_build_dir()) 'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(meson.current_build_dir())
}, },
'installed_tests_env' : {
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(installed_tests_execdir),
},
'suite': ['flaky'], 'suite': ['flaky'],
}, },
'gschema-compile' : {'install' : false}, 'gschema-compile' : {'install' : false},