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

Merge branch '1541-timeloop-closure' into 'master'

Browse Source 
Meson: Install timeloop-closure test

Closes #1541

See merge request GNOME/glib!349
This commit is contained in:
Xavier Claessens 2018-09-24 19:27:38 +00:00
commit b803d94366
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
tests/gobject/meson.build
View File

@ -26,7 +26,9 @@ testmarshal_c = custom_target('testmarshal_c',
], ],
) )
gobject_tests = { # FIXME: We are using list of dictionnaries until we can depend on Meson 0.48.0
# that supports '+=' operator on dictionnaries.
gobject_tests = [{
'gvalue-test' : {'tap' : true}, 'gvalue-test' : {'tap' : true},
'paramspec-test' : {'tap' : true}, 'paramspec-test' : {'tap' : true},
'deftype' : {}, 'deftype' : {},
@ -44,41 +46,49 @@ gobject_tests = {
'accumulator' : { 'accumulator' : {
'extra_sources' : [testmarshal_c, testmarshal_h], 'extra_sources' : [testmarshal_c, testmarshal_h],
}, },
} }]
if host_system != 'windows'
gobject_tests += [{
'timeloop-closure' : {},
}]
endif
common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS'] common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS']
common_deps = [libm, thread_dep, libglib_dep, libgobject_dep] common_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
foreach test_name, extra_args : gobject_tests foreach test_dict : gobject_tests
source = extra_args.get('source', test_name + '.c') foreach test_name, extra_args : test_dict
extra_sources = extra_args.get('extra_sources', []) source = extra_args.get('source', test_name + '.c')
install = installed_tests_enabled and extra_args.get('install', true) extra_sources = extra_args.get('extra_sources', [])
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template install = installed_tests_enabled and extra_args.get('install', true)
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
if install if install
test_conf = configuration_data() test_conf = configuration_data()
test_conf.set('installed_tests_dir', installed_tests_execdir) test_conf.set('installed_tests_dir', installed_tests_execdir)
test_conf.set('program', test_name) test_conf.set('program', test_name)
configure_file( configure_file(
input: template, input: template,
output: test_name + '.test', output: test_name + '.test',
install_dir: installed_tests_metadir, install_dir: installed_tests_metadir,
configuration: test_conf configuration: test_conf
)
endif
# FIXME? $(GLIB_DEBUG_FLAGS)
exe = executable(test_name, [source, extra_sources],
c_args : common_c_args + extra_args.get('c_args', []),
dependencies : common_deps + extra_args.get('dependencies', []),
install_dir: installed_tests_execdir,
install: install,
) )
endif
# FIXME? $(GLIB_DEBUG_FLAGS) suite = ['gobject'] + extra_args.get('suite', [])
exe = executable(test_name, [source, extra_sources], timeout = suite.contains('slow') ? 120 : 30
c_args : common_c_args + extra_args.get('c_args', []), # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
dependencies : common_deps + extra_args.get('dependencies', []), test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
install_dir: installed_tests_execdir, endforeach
install: install,
)
suite = ['gobject'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach endforeach
# Don't install these ones, and keep them out of 'make check' because they take too long... # Don't install these ones, and keep them out of 'make check' because they take too long...
@ -91,10 +101,3 @@ executable('performance-threaded', 'performance-threaded.c',
c_args : common_c_args, c_args : common_c_args,
dependencies : common_deps, dependencies : common_deps,
install : false) install : false)
if host_system != 'windows' and host_system != 'minix'
executable('timeloop-closure', 'timeloop-closure.c',
c_args : common_c_args,
dependencies : common_deps,
install : false)
endif