mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-24 14:36:13 +01:00
tests: Move common test environment variables to top level
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
parent
86d4da1634
commit
88e160dfe4
@ -144,7 +144,7 @@ python_tests = [
|
||||
'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_BUILDDIR', meson.current_build_dir())
|
||||
test_env.set('GIO_MODULE_DIR', '')
|
||||
|
@ -236,11 +236,9 @@ if installed_tests_enabled
|
||||
install_subdir('time-zones', install_dir : installed_tests_execdir)
|
||||
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_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_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']
|
||||
|
@ -41,11 +41,9 @@ foreach module : ['moduletestplugin_a', 'moduletestplugin_b']
|
||||
)
|
||||
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_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_cargs = ['-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT']
|
||||
|
@ -117,12 +117,9 @@ python_tests = [
|
||||
'mkenums.py',
|
||||
]
|
||||
|
||||
# FIXME: put common bits of test environment() in one location
|
||||
test_env = environment()
|
||||
test_env = environment(common_test_env)
|
||||
test_env.set('G_TEST_SRCDIR', meson.current_source_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_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT']
|
||||
|
@ -3,12 +3,9 @@ gobject_tests = {
|
||||
'performance-threaded' : { 'args' : [ '--seconds', '0' ] },
|
||||
}
|
||||
|
||||
# FIXME: put common bits of test environment() in one location
|
||||
test_env = environment()
|
||||
test_env = environment(common_test_env)
|
||||
test_env.set('G_TEST_SRCDIR', meson.current_source_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_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT']
|
||||
|
@ -2371,6 +2371,10 @@ if want_systemtap and enable_dtrace
|
||||
enable_systemtap = true
|
||||
endif
|
||||
|
||||
common_test_env = [
|
||||
'G_DEBUG=gc-friendly',
|
||||
'MALLOC_CHECK_=2',
|
||||
]
|
||||
test_timeout = 60
|
||||
test_timeout_slow = 180
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user