From 57c9bdd0bdd00ac6b95981d96f94cb60939fae90 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 9 Feb 2025 16:27:16 +0000 Subject: [PATCH 1/2] [test] Exclude google-benchmark tests by default if meson "recent" and... ...glib not built internally. Second try. See https://github.com/harfbuzz/harfbuzz/issues/4153#issuecomment-2646347531 --- meson.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meson.build b/meson.build index f3e43b595..bb53d6136 100644 --- a/meson.build +++ b/meson.build @@ -464,6 +464,13 @@ configure_file(output: 'config.h', configuration: conf) alias_target('lib', libharfbuzz) alias_target('libs', libharfbuzz, libharfbuzz_subset) +if meson.version().version_compare('>=0.57.0') + # Re glib, see https://github.com/harfbuzz/harfbuzz/issues/4153#issuecomment-2646347531 + add_test_setup('default', + exclude_suites: ['google-benchmark'], + is_default: glib_dep.type_name() != 'internal') +endif + build_summary = { 'Directories': {'prefix': get_option('prefix'), From b540c37c89919876cbdbe4d844b8af8702093abb Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 9 Feb 2025 09:47:18 -0700 Subject: [PATCH 2/2] Update meson.build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: خالد حسني (Khaled Hosny) --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index bb53d6136..1eeec4291 100644 --- a/meson.build +++ b/meson.build @@ -468,7 +468,7 @@ if meson.version().version_compare('>=0.57.0') # Re glib, see https://github.com/harfbuzz/harfbuzz/issues/4153#issuecomment-2646347531 add_test_setup('default', exclude_suites: ['google-benchmark'], - is_default: glib_dep.type_name() != 'internal') + is_default: glib_dep.type_name() != 'internal' and not meson.is_subproject()) endif build_summary = {