luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-07 00:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'socketclient-slow-install-preload-library' into 'master'

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

See merge request GNOME/glib!651
This commit is contained in:
Iain Lane
2019-02-13 10:00:13 +00:00
parent 16dc979d0e 1ecaae6454
commit 95899c11d9
8 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gio/tests/meson.build
View File

@@ -140,11 +140,16 @@ if host_machine.system() != 'windows'
'slow-connect-preload.c',
name_prefix : '',
dependencies: cc.find_library('dl'),
install_dir : installed_tests_execdir,
install: installed_tests_enabled,
)
],
'env' : {
'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'],
},
'gschema-compile' : {'install' : false},
@@ -593,11 +598,21 @@ foreach test_name, extra_args : gio_tests
source = extra_args.get('source', test_name + '.c')
extra_sources = extra_args.get('extra_sources', [])
install = installed_tests_enabled and extra_args.get('install', true)
installed_tests_env = extra_args.get('installed_tests_env', {})
if install
test_conf = configuration_data()
test_conf.set('installed_tests_dir', installed_tests_execdir)
test_conf.set('program', test_name)
test_env_override = ''
if installed_tests_env != {}
envs = []
foreach var, value : installed_tests_env
envs += '@0@=@1@'.format(var, value)
endforeach
test_env_override = '@0@ @1@ '.format(env_program.path(), ' '.join(envs))
endif
test_conf.set('env', test_env_override)
configure_file(
input: installed_tests_template_tap,
output: test_name + '.test',