diff options
-rw-r--r-- | gio/tests/meson.build | 46 | ||||
-rw-r--r-- | gio/tests/services/meson.build | 1 | ||||
-rw-r--r-- | glib/tests/meson.build | 29 | ||||
-rw-r--r-- | glib/tests/path-test-subdir/meson.build | 1 | ||||
-rw-r--r-- | gmodule/tests/meson.build | 4 | ||||
-rw-r--r-- | gobject/tests/meson.build | 5 | ||||
-rw-r--r-- | gobject/tests/performance/meson.build | 2 |
7 files changed, 79 insertions, 9 deletions
diff --git a/gio/tests/meson.build b/gio/tests/meson.build index c3e4e4cb3..8213599fa 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -222,6 +222,7 @@ if host_machine.system() != 'windows' name_prefix : '', dependencies: libdl_dep, install_dir : installed_tests_execdir, + install_tag : 'tests', install: installed_tests_enabled, ) ], @@ -419,6 +420,7 @@ if host_machine.system() != 'windows' c_args : test_c_args, dependencies : common_gio_tests_deps, install_dir : installed_tests_execdir, + install_tag : 'tests', install : installed_tests_enabled) gio_tests += { @@ -544,6 +546,7 @@ foreach appinfo_test_desktop_file : appinfo_test_desktop_files input: appinfo_test_desktop_file + '.in', output: appinfo_test_desktop_file, install_dir: installed_tests_execdir, + install_tag: 'tests', configuration: cdata, ) else @@ -566,11 +569,24 @@ if installed_tests_enabled 'org.gtk.test.dbusappinfo.flatpak.desktop', 'test1.overlay', install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_subdir('x-content', + install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_subdir('desktop-files', + install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_subdir('thumbnails', + install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_subdir('cert-tests', + install_dir : installed_tests_execdir, + install_tag : 'tests', ) - install_subdir('x-content', install_dir : installed_tests_execdir) - install_subdir('desktop-files', install_dir : installed_tests_execdir) - install_subdir('thumbnails', install_dir : installed_tests_execdir) - install_subdir('cert-tests', install_dir : installed_tests_execdir) cdata = configuration_data() cdata.set('installed_tests_dir', installed_tests_execdir) @@ -579,10 +595,17 @@ if installed_tests_enabled input: installed_tests_template, output: 'static-link.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: cdata ) - install_subdir('static-link', install_dir : installed_tests_execdir) - install_data('static-link.py', install_dir : installed_tests_execdir) + install_subdir('static-link', + install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_data('static-link.py', + install_dir : installed_tests_execdir, + install_tag : 'tests', + ) monitor_tests = [ 'memory-monitor-dbus', @@ -600,6 +623,7 @@ if installed_tests_enabled input: installed_tests_template_tap, output: monitor_test + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: cdata ) cdata = configuration_data() @@ -608,6 +632,7 @@ if installed_tests_enabled input: monitor_test + '.py.in', output: monitor_test + '.py', install_dir : installed_tests_execdir, + install_tag : 'tests', configuration: cdata, ) endforeach @@ -633,6 +658,7 @@ if meson.can_run_host_binaries() link_args : export_dynamic_ldflags, dependencies : common_gio_tests_deps, install_dir : installed_tests_execdir, + install_tag : 'tests', install : installed_tests_enabled ) @@ -654,6 +680,7 @@ if meson.can_run_host_binaries() '--internal', '@INPUT@'], install_dir : installed_tests_execdir, + install_tag : 'tests', install : installed_tests_enabled) test_resources2_c = custom_target('test_resources2.c', @@ -766,6 +793,7 @@ if meson.can_run_host_binaries() '--internal', '@INPUT@'], install_dir : installed_tests_execdir, + install_tag : 'tests', install : installed_tests_enabled) # Create resource data file @@ -847,6 +875,7 @@ foreach test_name, extra_args : gio_tests input: installed_tests_template_tap, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf ) endif @@ -856,6 +885,7 @@ foreach test_name, extra_args : gio_tests dependencies : common_gio_tests_deps + extra_args.get('dependencies', []), install_rpath : extra_args.get('install_rpath', ''), install_dir: installed_tests_execdir, + install_tag: 'tests', install: install, ) @@ -885,6 +915,7 @@ foreach program_name, extra_args : test_extra_programs c_args : test_c_args, dependencies : common_gio_tests_deps + extra_args.get('dependencies', []), install_dir : installed_tests_execdir, + install_tag : 'tests', install : install, ) endforeach @@ -902,6 +933,7 @@ foreach test_name : python_tests install_data( files(test_name), install_dir: installed_tests_execdir, + install_tag: 'tests', install_mode: 'rwxr-xr-x', ) @@ -913,6 +945,7 @@ foreach test_name : python_tests input: installed_tests_template_tap, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf, ) endif @@ -923,6 +956,7 @@ if installed_tests_enabled install_data( files('taptestrunner.py'), install_dir: installed_tests_execdir, + install_tag: 'tests', ) endif diff --git a/gio/tests/services/meson.build b/gio/tests/services/meson.build index fd5117e23..b6a901bc5 100644 --- a/gio/tests/services/meson.build +++ b/gio/tests/services/meson.build @@ -25,6 +25,7 @@ foreach service_file : dbus_service_files ) install_data(meson.current_build_dir() / service_file + '.to-install', install_dir: installed_tests_execdir / 'services', + install_tag: 'tests', rename: [service_file], ) endif diff --git a/glib/tests/meson.build b/glib/tests/meson.build index d74617823..9a4b6107a 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -202,6 +202,7 @@ else name_prefix : '', dependencies: libdl_dep, install_dir : installed_tests_execdir, + install_tag : 'tests', install: installed_tests_enabled, ), ], @@ -230,10 +231,20 @@ if installed_tests_enabled 'NormalizationTest.txt', 'pages.ini', install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_subdir('bookmarks', + install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_subdir('markups', + install_dir : installed_tests_execdir, + install_tag : 'tests', + ) + install_subdir('time-zones', + install_dir : installed_tests_execdir, + install_tag : 'tests', ) - install_subdir('bookmarks', install_dir : installed_tests_execdir) - install_subdir('markups', install_dir : installed_tests_execdir) - install_subdir('time-zones', install_dir : installed_tests_execdir) endif test_env = environment() @@ -258,6 +269,7 @@ foreach test_name, extra_args : glib_tests input: installed_tests_template_tap, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf ) endif @@ -267,6 +279,7 @@ foreach test_name, extra_args : glib_tests link_args : extra_args.get('link_args', []), dependencies : test_deps + extra_args.get('dependencies', []), install_dir: installed_tests_execdir, + install_tag: 'tests', install: install, ) @@ -284,6 +297,7 @@ if installed_tests_enabled install_data( 'utf8.txt', install_dir : installed_tests_execdir, + install_tag : 'tests', ) endif @@ -295,6 +309,7 @@ executable('assert-msg-test', ['assert-msg-test.c'], c_args : test_cargs, dependencies : test_deps, install_dir : installed_tests_execdir, + install_tag : 'tests', install : installed_tests_enabled, win_subsystem : extra_args.get('win_subsystem', 'console'), ) @@ -312,6 +327,7 @@ foreach test_name : python_tests install_data( files(test_name), install_dir: installed_tests_execdir, + install_tag: 'tests', install_mode: 'rwxr-xr-x', ) @@ -323,6 +339,7 @@ foreach test_name : python_tests input: installed_tests_template_tap, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf, ) endif @@ -332,6 +349,7 @@ executable('spawn-path-search-helper', 'spawn-path-search-helper.c', c_args : test_cargs, dependencies : test_deps, install_dir: installed_tests_execdir, + install_tag: 'tests', install: installed_tests_enabled, ) @@ -339,6 +357,7 @@ executable('spawn-test-helper', 'spawn-test-helper.c', c_args : test_cargs, dependencies : test_deps, install_dir: installed_tests_execdir, + install_tag: 'tests', install: installed_tests_enabled, ) @@ -347,6 +366,7 @@ executable('test-spawn-echo', 'test-spawn-echo.c', c_args : test_cargs, dependencies : test_deps, install_dir: installed_tests_execdir, + install_tag: 'tests', install: installed_tests_enabled, ) @@ -356,12 +376,14 @@ if host_machine.system() == 'windows' c_args : test_cargs, dependencies : test_deps, install_dir: installed_tests_execdir, + install_tag: 'tests', install: installed_tests_enabled, ) executable('spawn-test-win32-gui', 'spawn-test-win32-gui.c', c_args : test_cargs, dependencies : test_deps, install_dir: installed_tests_execdir, + install_tag: 'tests', install: installed_tests_enabled, win_subsystem: 'windows', ) @@ -371,6 +393,7 @@ executable('testing-helper', 'testing-helper.c', c_args : test_cargs, dependencies : test_deps, install_dir: installed_tests_execdir, + install_tag: 'tests', install: installed_tests_enabled, ) diff --git a/glib/tests/path-test-subdir/meson.build b/glib/tests/path-test-subdir/meson.build index 351254cd8..50c604899 100644 --- a/glib/tests/path-test-subdir/meson.build +++ b/glib/tests/path-test-subdir/meson.build @@ -2,5 +2,6 @@ executable('spawn-test-helper', 'spawn-test-helper.c', c_args : test_cargs, dependencies : test_deps, install_dir: join_paths(installed_tests_execdir, 'path-test-subdir'), + install_tag: 'tests', install: installed_tests_enabled, ) diff --git a/gmodule/tests/meson.build b/gmodule/tests/meson.build index cc8125eda..d8ad5f758 100644 --- a/gmodule/tests/meson.build +++ b/gmodule/tests/meson.build @@ -30,12 +30,14 @@ foreach module : ['moduletestplugin_a', 'moduletestplugin_b'] shared_module(module + '_plugin', 'lib@0@.c'.format(module), dependencies : [libglib_dep, libgmodule_dep], install_dir : installed_tests_execdir, + install_tag : 'tests', install : installed_tests_enabled, name_suffix : module_suffix ) shared_library(module + '_library', 'lib@0@.c'.format(module), dependencies : [libglib_dep, libgmodule_dep], install_dir : installed_tests_execdir, + install_tag : 'tests', install : installed_tests_enabled, name_suffix : module_suffix ) @@ -63,6 +65,7 @@ foreach test_name, extra_args : gmodule_tests input: installed_tests_template_tap, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf ) endif @@ -73,6 +76,7 @@ foreach test_name, extra_args : gmodule_tests dependencies : test_deps + extra_args.get('dependencies', []), export_dynamic : extra_args.get('export_dynamic', false), install_dir: installed_tests_execdir, + install_tag: 'tests', install: install, ) diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build index 58cf4ab1f..d0fa60567 100644 --- a/gobject/tests/meson.build +++ b/gobject/tests/meson.build @@ -139,6 +139,7 @@ foreach test_name, extra_args : gobject_tests input: installed_tests_template_tap, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf ) endif @@ -147,6 +148,7 @@ foreach test_name, extra_args : gobject_tests c_args : test_cargs + extra_args.get('c_args', []), dependencies : test_deps + extra_args.get('dependencies', []), install_dir: installed_tests_execdir, + install_tag: 'tests', install: install, ) @@ -175,6 +177,7 @@ foreach test_name : python_tests install_data( files(test_name), install_dir: installed_tests_execdir, + install_tag: 'tests', install_mode: 'rwxr-xr-x', ) @@ -186,6 +189,7 @@ foreach test_name : python_tests input: installed_tests_template_tap, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf, ) endif @@ -196,5 +200,6 @@ if installed_tests_enabled install_data( files('taptestrunner.py'), install_dir: installed_tests_execdir, + install_tag: 'tests', ) endif diff --git a/gobject/tests/performance/meson.build b/gobject/tests/performance/meson.build index 22bf79da0..f9102ff4a 100644 --- a/gobject/tests/performance/meson.build +++ b/gobject/tests/performance/meson.build @@ -26,6 +26,7 @@ foreach test_name, extra_args : gobject_tests input: installed_tests_template, output: test_name + '.test', install_dir: installed_tests_metadir, + install_tag: 'tests', configuration: test_conf, ) endif @@ -34,6 +35,7 @@ foreach test_name, extra_args : gobject_tests c_args : test_cargs + extra_args.get('c_args', []), dependencies : test_deps + extra_args.get('dependencies', []), install_dir: installed_tests_execdir, + install_tag: 'tests', install: install, ) |