From 1b345e411fa25c774d3429d9083a4fd5e5ac3ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 30 Jun 2023 02:51:44 +0200 Subject: [PATCH] meson: Add all the gdbus-codegen based tests to the proper suite So it's easier to run them all with --suite=gdbus-codegen --- gio/tests/meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 2ff34a5d0..c1240b527 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -170,7 +170,10 @@ test_extra_programs = { python_tests = { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/2764 - 'codegen.py' : { 'can_fail' : host_system == 'freebsd' }, + 'codegen.py' : { + 'can_fail' : host_system == 'freebsd', + 'suite': ['gdbus-codegen'], + }, } test_env = environment() @@ -458,6 +461,7 @@ if host_machine.system() != 'windows' 'gdbus-test-codegen' : { 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'], + 'suite': ['gdbus-codegen'], }, 'gdbus-threading' : { 'extra_sources' : extra_sources, @@ -476,11 +480,13 @@ if host_machine.system() != 'windows' 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36'], + 'suite': ['gdbus-codegen'], }, 'gdbus-test-codegen-min-required-2-64' : { 'source' : 'gdbus-test-codegen.c', 'extra_sources' : [extra_sources, gdbus_test_codegen_generated_min_required_2_64, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_64'], + 'suite': ['gdbus-codegen'], }, 'gapplication' : { 'extra_sources' : extra_sources, @@ -1045,7 +1051,7 @@ endforeach foreach test_name, extra_args : python_tests depends = [extra_args.get('depends', [])] - suite = ['gio', 'no-valgrind'] + suite = ['gio', 'no-valgrind'] + extra_args.get('suite', []) if extra_args.get('can_fail', false) suite += 'failing'