luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-24 00:20:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'installed-tests' into 'master'

Browse Source 
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
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/tests/meson.build
View File

@ -521,14 +521,13 @@ if installed_tests_enabled
) )
install_subdir('static-link', install_dir : installed_tests_execdir) install_subdir('static-link', install_dir : installed_tests_execdir)
install_data('static-link.py', install_dir : installed_tests_execdir) install_data('static-link.py', install_dir : installed_tests_execdir)
endif
memory_monitor_tests = [ memory_monitor_tests = [
'memory-monitor-dbus', 'memory-monitor-dbus',
'memory-monitor-portal', 'memory-monitor-portal',
] ]
foreach memory_monitor_test : memory_monitor_tests foreach memory_monitor_test : memory_monitor_tests
cdata = configuration_data() cdata = configuration_data()
cdata.set('installed_tests_dir', installed_tests_execdir) cdata.set('installed_tests_dir', installed_tests_execdir)
cdata.set('program', memory_monitor_test + '.py') cdata.set('program', memory_monitor_test + '.py')
@ -546,7 +545,8 @@ foreach memory_monitor_test : memory_monitor_tests
install_dir : installed_tests_execdir, install_dir : installed_tests_execdir,
configuration: cdata, configuration: cdata,
) )
endforeach endforeach
endif
if not meson.is_cross_build() or meson.has_exe_wrapper() if not meson.is_cross_build() or meson.has_exe_wrapper()