Meson: Use environment() for test_env

This commit is contained in:
Xavier Claessens
2018-07-16 11:52:53 -04:00
parent 8d2d0a8aa1
commit f456e311cd
4 changed files with 22 additions and 28 deletions

View File

@@ -79,12 +79,11 @@ test_extra_programs = [
['gdbus-testserver'],
]
test_env = [
'G_TEST_SRCDIR=' + meson.current_source_dir(),
'G_TEST_BUILDDIR=' + meson.current_build_dir(),
'GIO_MODULE_DIR=',
'GIO_LAUNCH_DESKTOP=' + meson.build_root() + '/gio/gio-launch-desktop',
]
test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('GIO_MODULE_DIR', '')
test_env.set('GIO_LAUNCH_DESKTOP', meson.build_root() + '/gio/gio-launch-desktop')
test_c_args = [
'-DG_LOG_DOMAIN="GLib-GIO"',