luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Move common test environment variables to top level

Browse Source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-09-13 11:35:34 +01:00
parent 86d4da1634
commit 88e160dfe4
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/meson.build
View File

@ -144,7 +144,7 @@ python_tests = [
'codegen.py', 'codegen.py',
] ]
test_env = environment() test_env = environment(common_test_env)
test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('GIO_MODULE_DIR', '') test_env.set('GIO_MODULE_DIR', '')

4
glib/tests/meson.build
View File

@ -236,11 +236,9 @@ if installed_tests_enabled
install_subdir('time-zones', install_dir : installed_tests_execdir) install_subdir('time-zones', install_dir : installed_tests_execdir)
endif endif
test_env = environment() test_env = environment(common_test_env)
test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('G_DEBUG', 'gc-friendly')
test_env.set('MALLOC_CHECK_', '2')
test_deps = [libm, thread_dep, libglib_dep] test_deps = [libm, thread_dep, libglib_dep]
test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT'] test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']

4
gmodule/tests/meson.build
View File

@ -41,11 +41,9 @@ foreach module : ['moduletestplugin_a', 'moduletestplugin_b']
) )
endforeach endforeach
test_env = environment() test_env = environment(common_test_env)
test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('G_DEBUG', 'gc-friendly')
test_env.set('MALLOC_CHECK_', '2')
test_deps = [libm, thread_dep, libglib_dep, libgmodule_dep] test_deps = [libm, thread_dep, libglib_dep, libgmodule_dep]
test_cargs = ['-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT'] test_cargs = ['-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT']

5
gobject/tests/meson.build
View File

@ -117,12 +117,9 @@ python_tests = [
'mkenums.py', 'mkenums.py',
] ]
# FIXME: put common bits of test environment() in one location test_env = environment(common_test_env)
test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('G_DEBUG', 'gc-friendly')
test_env.set('MALLOC_CHECK_', '2')
test_deps = [libm, thread_dep, libglib_dep, libgobject_dep] test_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT'] test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT']

5
gobject/tests/performance/meson.build
View File

@ -3,12 +3,9 @@ gobject_tests = {
'performance-threaded' : { 'args' : [ '--seconds', '0' ] }, 'performance-threaded' : { 'args' : [ '--seconds', '0' ] },
} }
# FIXME: put common bits of test environment() in one location test_env = environment(common_test_env)
test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('G_DEBUG', 'gc-friendly')
test_env.set('MALLOC_CHECK_', '2')
test_deps = [libm, thread_dep, libglib_dep, libgobject_dep] test_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT'] test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT']

4
meson.build
View File

@ -2371,6 +2371,10 @@ if want_systemtap and enable_dtrace
enable_systemtap = true enable_systemtap = true
endif endif
common_test_env = [
'G_DEBUG=gc-friendly',
'MALLOC_CHECK_=2',
]
test_timeout = 60 test_timeout = 60
test_timeout_slow = 180 test_timeout_slow = 180