mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-04 08:23:38 +02:00
Meson: Bump dependency to 0.48.0
This commit is contained in:
Xavier Claessens
@@ -26,9 +26,7 @@ testmarshal_c = custom_target('testmarshal_c',
|
||||
],
|
||||
)
|
||||
|
||||
# FIXME: We are using list of dictionnaries until we can depend on Meson 0.48.0
|
||||
# that supports '+=' operator on dictionnaries.
|
||||
gobject_tests = [{
|
||||
gobject_tests = {
|
||||
'gvalue-test' : {'tap' : true},
|
||||
'paramspec-test' : {'tap' : true},
|
||||
'deftype' : {},
|
||||
@@ -46,51 +44,49 @@ gobject_tests = [{
|
||||
'accumulator' : {
|
||||
'extra_sources' : [testmarshal_c, testmarshal_h],
|
||||
},
|
||||
}]
|
||||
}
|
||||
|
||||
if host_system != 'windows'
|
||||
gobject_tests += [{
|
||||
gobject_tests += {
|
||||
'timeloop-closure' : {},
|
||||
}]
|
||||
}
|
||||
endif
|
||||
|
||||
common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS']
|
||||
common_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
|
||||
|
||||
foreach test_dict : gobject_tests
|
||||
foreach test_name, extra_args : test_dict
|
||||
source = extra_args.get('source', test_name + '.c')
|
||||
extra_sources = extra_args.get('extra_sources', [])
|
||||
install = installed_tests_enabled and extra_args.get('install', true)
|
||||
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
|
||||
test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
|
||||
foreach test_name, extra_args : gobject_tests
|
||||
source = extra_args.get('source', test_name + '.c')
|
||||
extra_sources = extra_args.get('extra_sources', [])
|
||||
install = installed_tests_enabled and extra_args.get('install', true)
|
||||
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
|
||||
test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
|
||||
|
||||
if install
|
||||
test_conf = configuration_data()
|
||||
test_conf.set('installed_tests_dir', installed_tests_execdir)
|
||||
test_conf.set('program', test_name)
|
||||
configure_file(
|
||||
input: template,
|
||||
output: test_name + '.test',
|
||||
install_dir: installed_tests_metadir,
|
||||
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,
|
||||
if install
|
||||
test_conf = configuration_data()
|
||||
test_conf.set('installed_tests_dir', installed_tests_execdir)
|
||||
test_conf.set('program', test_name)
|
||||
configure_file(
|
||||
input: template,
|
||||
output: test_name + '.test',
|
||||
install_dir: installed_tests_metadir,
|
||||
configuration: test_conf
|
||||
)
|
||||
endif
|
||||
|
||||
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,
|
||||
args : test_command_args)
|
||||
endforeach
|
||||
# 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,
|
||||
)
|
||||
|
||||
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,
|
||||
args : test_command_args)
|
||||
endforeach
|
||||
|
||||
# Don't install these ones, and keep them out of 'make check' because they take too long...
|
||||
|
||||
@@ -15,9 +15,7 @@ test_cargs = ['-DG_LOG_DOMAIN="GLib"']
|
||||
subdir('gobject')
|
||||
subdir('refcount')
|
||||
|
||||
# FIXME: We are using list of dictionnaries until we can depend on Meson 0.48.0
|
||||
# that supports '+=' operator on dictionnaries.
|
||||
tests = [{
|
||||
tests = {
|
||||
'testglib' : {'tap' : true},
|
||||
'testgdate' : {},
|
||||
'datetime' : {},
|
||||
@@ -54,7 +52,7 @@ tests = [{
|
||||
'include_directories' : gmoduleinc,
|
||||
'dependencies' : [libgio_dep],
|
||||
},
|
||||
}]
|
||||
}
|
||||
|
||||
test_extra_programs = {
|
||||
'slice-test' : {
|
||||
@@ -68,11 +66,11 @@ test_extra_programs = {
|
||||
}
|
||||
|
||||
if host_machine.system() != 'windows'
|
||||
tests += [{
|
||||
tests += {
|
||||
'timeloop' : {},
|
||||
'spawn-test' : {},
|
||||
'iochannel-test' : {},
|
||||
}]
|
||||
}
|
||||
endif
|
||||
|
||||
if installed_tests_enabled
|
||||
@@ -96,42 +94,40 @@ endforeach
|
||||
common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS']
|
||||
common_deps = [libm, thread_dep, libglib_dep]
|
||||
|
||||
foreach test_dict : tests
|
||||
foreach test_name, extra_args : test_dict
|
||||
source = extra_args.get('source', test_name + '.c')
|
||||
extra_sources = extra_args.get('extra_sources', [])
|
||||
install = installed_tests_enabled and extra_args.get('install', true)
|
||||
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
|
||||
test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
|
||||
foreach test_name, extra_args : tests
|
||||
source = extra_args.get('source', test_name + '.c')
|
||||
extra_sources = extra_args.get('extra_sources', [])
|
||||
install = installed_tests_enabled and extra_args.get('install', true)
|
||||
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
|
||||
test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
|
||||
|
||||
if install
|
||||
test_conf = configuration_data()
|
||||
test_conf.set('installed_tests_dir', installed_tests_execdir)
|
||||
test_conf.set('program', test_name)
|
||||
configure_file(
|
||||
input: template,
|
||||
output: test_name + '.test',
|
||||
install_dir: installed_tests_metadir,
|
||||
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', []),
|
||||
export_dynamic : extra_args.get('export_dynamic', false),
|
||||
include_directories : extra_args.get('include_directories', []),
|
||||
install_dir: installed_tests_execdir,
|
||||
install: install,
|
||||
if install
|
||||
test_conf = configuration_data()
|
||||
test_conf.set('installed_tests_dir', installed_tests_execdir)
|
||||
test_conf.set('program', test_name)
|
||||
configure_file(
|
||||
input: template,
|
||||
output: test_name + '.test',
|
||||
install_dir: installed_tests_metadir,
|
||||
configuration: test_conf
|
||||
)
|
||||
endif
|
||||
|
||||
suite = ['glib'] + 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,
|
||||
args : test_command_args)
|
||||
endforeach
|
||||
# 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', []),
|
||||
export_dynamic : extra_args.get('export_dynamic', false),
|
||||
include_directories : extra_args.get('include_directories', []),
|
||||
install_dir: installed_tests_execdir,
|
||||
install: install,
|
||||
)
|
||||
|
||||
suite = ['glib'] + 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,
|
||||
args : test_command_args)
|
||||
endforeach
|
||||
|
||||
foreach program_name, extra_args : test_extra_programs
|
||||
|
||||
Reference in New Issue
Block a user