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

meson: glib/tests: add missing tests

Browse Source
This commit is contained in:
Tim-Philipp Müller 2017-01-26 10:49:47 +00:00 committed by Matthias Clasen
parent d29f022b0b
commit 89ee284d2b
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/meson.build
View File

@ -253,7 +253,7 @@ if host_system == 'windows'
dependencies : [libglib_dep]) dependencies : [libglib_dep])
endif endif
else else
executable('gtester', 'gtester.c', gtester = executable('gtester', 'gtester.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'], c_args : ['-DHAVE_CONFIG_H=1'],
include_directories : configinc, include_directories : configinc,

30
glib/tests/meson.build
View File

@ -39,6 +39,7 @@ glib_tests = [
'option-context', 'option-context',
'option-argv0', 'option-argv0',
'overflow', 'overflow',
# overflow-fallback handled separately below
'pattern', 'pattern',
'private', 'private',
'protocol', 'protocol',
@ -83,9 +84,16 @@ 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
random_number = minor_version.to_int() + meson.version().split('.').get(1).to_int()
test_env = [ test_env = [
'G_TEST_SRCDIR=' + meson.current_source_dir(), 'G_TEST_SRCDIR=' + meson.current_source_dir(),
'G_TEST_BUILDDIR=' + meson.current_build_dir(), 'G_TEST_BUILDDIR=' + meson.current_build_dir(),
'G_DEBUG=gc-friendly',
'MALLOC_CHECK_=2',
'MALLOC_PERTURB_=@0@'.format(random_number % 256),
] ]
test_cargs = ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib"'] test_cargs = ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib"']
@ -138,6 +146,12 @@ exe = executable('1bit-emufutex', '1bit-mutex.c',
) )
test('1bit-emufutex', exe, env : test_env) test('1bit-emufutex', exe, env : test_env)
exe = executable('gwakeup', 'gwakeuptest.c', '../gwakeup.c',
c_args : test_cargs,
dependencies : deps,
install : false)
test('gwakeup', exe, env : test_env)
if glib_conf.has('HAVE_EVENTFD') if glib_conf.has('HAVE_EVENTFD')
exe = executable('gwakeup-fallback', 'gwakeuptest.c', '../gwakeup.c', exe = executable('gwakeup-fallback', 'gwakeuptest.c', '../gwakeup.c',
c_args : test_cargs + ['-DTEST_EVENTFD_FALLBACK'], c_args : test_cargs + ['-DTEST_EVENTFD_FALLBACK'],
@ -153,3 +167,19 @@ executable('test-spawn-echo', 'test-spawn-echo.c',
dependencies : deps, dependencies : deps,
install : false, install : false,
) )
# some testing of gtester functionality
if not meson.is_cross_build() and meson.version().version_compare('> 0.37.9')
xmllint = find_program('xmllint')
if xmllint.found()
tmpsample_xml = custom_target('tmpsample.xml',
output : 'tmpsample.xml',
build_by_default : true, # hack around meson bug, see PR #1335
command : [ gtester, '-k', '--quiet', '-o', '@OUTPUT@',
'--test-arg=--gtester-selftest', gtester])
test('gtester-xmllint-check', xmllint,
args : ['--noout', tmpsample_xml],
env : test_env)
endif
endif