Merge branch 'installed-tests' into 'master'

tests: Move memory_monitor_tests under installed_tests_enabled

See merge request GNOME/glib!1395
This commit is contained in:
Simon McVittie 2020-02-28 14:02:32 +00:00
commit 08a4a2e6f4

View File

@ -521,33 +521,33 @@ if installed_tests_enabled
)
install_subdir('static-link', install_dir : installed_tests_execdir)
install_data('static-link.py', install_dir : installed_tests_execdir)
memory_monitor_tests = [
'memory-monitor-dbus',
'memory-monitor-portal',
]
foreach memory_monitor_test : memory_monitor_tests
cdata = configuration_data()
cdata.set('installed_tests_dir', installed_tests_execdir)
cdata.set('program', memory_monitor_test + '.py')
configure_file(
input: installed_tests_template,
output: memory_monitor_test + '.test',
install_dir: installed_tests_metadir,
configuration: cdata
)
cdata = configuration_data()
cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
configure_file(
input: memory_monitor_test + '.py.in',
output: memory_monitor_test + '.py',
install_dir : installed_tests_execdir,
configuration: cdata,
)
endforeach
endif
memory_monitor_tests = [
'memory-monitor-dbus',
'memory-monitor-portal',
]
foreach memory_monitor_test : memory_monitor_tests
cdata = configuration_data()
cdata.set('installed_tests_dir', installed_tests_execdir)
cdata.set('program', memory_monitor_test + '.py')
configure_file(
input: installed_tests_template,
output: memory_monitor_test + '.test',
install_dir: installed_tests_metadir,
configuration: cdata
)
cdata = configuration_data()
cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
configure_file(
input: memory_monitor_test + '.py.in',
output: memory_monitor_test + '.py',
install_dir : installed_tests_execdir,
configuration: cdata,
)
endforeach
if not meson.is_cross_build() or meson.has_exe_wrapper()
plugin_resources_c = custom_target('plugin-resources.c',