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

Meson: Use environment() for test_env

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/tests/meson.build
View File

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

14
glib/tests/meson.build
View File

@ -90,17 +90,15 @@ if cc.get_id() != 'msvc'
glib_tests += [ 'autoptr' ] glib_tests += [ 'autoptr' ]
endif endif
# FIXME: use new environment() object
# Not entirely random of course, but at least it changes over time # Not entirely random of course, but at least it changes over time
random_number = minor_version + meson.version().split('.').get(1).to_int() random_number = minor_version + meson.version().split('.').get(1).to_int()
test_env = [ test_env = environment()
'G_TEST_SRCDIR=' + meson.current_source_dir(), test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
'G_TEST_BUILDDIR=' + meson.current_build_dir(), test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
'G_DEBUG=gc-friendly', test_env.set('G_DEBUG', 'gc-friendly')
'MALLOC_CHECK_=2', test_env.set('MALLOC_CHECK_', '2')
'MALLOC_PERTURB_=@0@'.format(random_number % 256), test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
]
test_cargs = ['-DG_LOG_DOMAIN="GLib"'] test_cargs = ['-DG_LOG_DOMAIN="GLib"']

14
gobject/tests/meson.build
View File

@ -20,18 +20,16 @@ gobject_tests = [
'ifaceproperties', 'ifaceproperties',
] ]
# FIXME: use new environment() object
# FIXME: put common bits of test environment() in one location # FIXME: put common bits of test environment() in one location
# Not entirely random of course, but at least it changes over time # Not entirely random of course, but at least it changes over time
random_number = minor_version + meson.version().split('.').get(1).to_int() random_number = minor_version + meson.version().split('.').get(1).to_int()
test_env = [ test_env = environment()
'G_TEST_SRCDIR=' + meson.current_source_dir(), test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
'G_TEST_BUILDDIR=' + meson.current_build_dir(), test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
'G_DEBUG=gc-friendly', test_env.set('G_DEBUG', 'gc-friendly')
'MALLOC_CHECK_=2', test_env.set('MALLOC_CHECK_', '2')
'MALLOC_PERTURB_=@0@'.format(random_number % 256), test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
]
foreach test_name : gobject_tests foreach test_name : gobject_tests
deps = [libm, thread_dep, libglib_dep, libgobject_dep] deps = [libm, thread_dep, libglib_dep, libgobject_dep]

11
tests/meson.build
View File

@ -1,11 +1,10 @@
# tests # tests
test_env = [ test_env = environment()
'G_TEST_SRCDIR=' + meson.current_source_dir(), test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
'G_TEST_BUILDDIR=' + meson.current_build_dir(), test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
'G_DEBUG=gc-friendly', test_env.set('G_DEBUG', 'gc-friendly')
'MALLOC_CHECK_=2', test_env.set('MALLOC_CHECK_', '2')
]
test_cargs = ['-DG_LOG_DOMAIN="GLib"'] test_cargs = ['-DG_LOG_DOMAIN="GLib"']