diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-09-02 08:15:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-09-02 12:12:29 +0200 |
| commit | 5aa8e7ef07229d48cb719a5f3f01c9a7fa445554 (patch) | |
| tree | f07539093ab42a5d5b398b33db5d44ded978f7db /vcl/CppunitTest_vcl_cjk.mk | |
| parent | b392d0a25e229f305497ab5f9f084b71b24cc387 (diff) | |
Fix setting SAL_NON_APPLICATION_FONT_USE
...after a342b72f4218cd617aa6fb413fcf5fbb182c316f "gbuild: set
SAL_NON_APPLICATION_FONT_USE in gb_CppunitTest_use_more_fonts" had caused e.g.
CppunitTest_vcl_pdfexport to be executed with merely
SAL_NON_APPLICATION_FONT_USE=deny rather than the stronger
SAL_NON_APPLICATION_FONT_USE=abort that vcl/CppunitTest_vcl_pdfexport.mk asked
for.
So introduce a dedicated gb_CppunitTest_set_non_application_font_use that
accumulates the requested modes and then selects the strongest requested one
("allow" over "abort" over "deny"). That also means we can go back to model
"allow" with an unset SAL_NON_APPLICATION_FONT_USE env var.
Change-Id: I32ba0a94c1965f0e3336e676b17f4f5efb85efce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139251
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/CppunitTest_vcl_cjk.mk')
| -rw-r--r-- | vcl/CppunitTest_vcl_cjk.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/CppunitTest_vcl_cjk.mk b/vcl/CppunitTest_vcl_cjk.mk index 8da3e5da4019..ea2d70a35cd6 100644 --- a/vcl/CppunitTest_vcl_cjk.mk +++ b/vcl/CppunitTest_vcl_cjk.mk @@ -64,8 +64,6 @@ $(eval $(call gb_CppunitTest_use_more_fonts,vcl_cjk)) # we don't have any bundled cjk fonts, so allow use of # system fonts for the cjk tests, tests have to survive # unavailable fonts -$(call gb_CppunitTest_get_target,vcl_cjk): \ - EXTRA_ENV_VARS := \ - SAL_NON_APPLICATION_FONT_USE=allow +$(eval $(call gb_CppunitTest_set_non_application_font_use,vcl_cjk,allow)) # vim: set noet sw=4 ts=4: |