solenv/gbuild/CppunitTest.mk | 1 + vcl/CppunitTest_vcl_text.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-)
New commits: commit a342b72f4218cd617aa6fb413fcf5fbb182c316f Author: Khaled Hosny <kha...@aliftype.com> AuthorDate: Thu Sep 1 09:25:52 2022 +0200 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu Sep 1 11:52:36 2022 +0200 gbuild: set SAL_NON_APPLICATION_FONT_USE in gb_CppunitTest_use_more_fonts So it applies to all tests using HAVE_MORE_FONTS. Change-Id: I60567c996286aa8a76c7180c58aea7f214a99d87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139144 Tested-by: Jenkins Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 821d1d6f2c74..fbfc3f30aacb 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -387,6 +387,7 @@ define gb_CppunitTest_use_more_fonts ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) $(call gb_CppunitTest_get_target,$(1)) : \ $(foreach font,$(gb_Package_MODULE_ooo_fonts),$(call gb_Package_get_target,$(font))) +$(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS := SAL_NON_APPLICATION_FONT_USE=deny endif endef diff --git a/vcl/CppunitTest_vcl_text.mk b/vcl/CppunitTest_vcl_text.mk index cf091ba88c25..4ffa3b1990ca 100644 --- a/vcl/CppunitTest_vcl_text.mk +++ b/vcl/CppunitTest_vcl_text.mk @@ -61,11 +61,6 @@ $(eval $(call gb_CppunitTest_use_components,vcl_text,\ $(eval $(call gb_CppunitTest_use_configuration,vcl_text)) -# only allow bundled fonts, but don't abort if font/glyph fallback occurs -$(call gb_CppunitTest_get_target,vcl_text): \ - EXTRA_ENV_VARS := \ - SAL_NON_APPLICATION_FONT_USE=deny - $(eval $(call gb_CppunitTest_use_more_fonts,vcl_text)) # vim: set noet sw=4 ts=4: