sw/CppunitTest_sw_core_header_footer.mk | 4 ++++ sw/CppunitTest_sw_filter_ww8.mk | 4 ++++ sw/CppunitTest_sw_layoutwriter5.mk | 4 ++++ sw/CppunitTest_sw_ooxml_theme_export.mk | 4 ++++ sw/CppunitTest_sw_ooxmlimport2.mk | 4 ++++ sw/CppunitTest_sw_ooxmllinks.mk | 4 ++++ sw/CppunitTest_sw_ooxmlw14export.mk | 4 ++++ xmloff/CppunitTest_xmloff_style.mk | 4 ++++ 8 files changed, 32 insertions(+)
New commits: commit 6f2c4eeb600518149084d92b2153fa45a4691895 Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Nov 21 17:29:40 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Sat Nov 22 16:11:45 2025 +0100 Even more CppunitTests need the ASan hack now ...from e854abe076155fc085b56549ced50b3ee9a095d2 "Avoid external processes picking up instdir/program/libnspr4.so" Change-Id: I2d9a73050433f5f52061aeadd1a3f8a24b88d826 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194346 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins diff --git a/sw/CppunitTest_sw_core_header_footer.mk b/sw/CppunitTest_sw_core_header_footer.mk index 5f1668c3fb49..057e2aa91206 100644 --- a/sw/CppunitTest_sw_core_header_footer.mk +++ b/sw/CppunitTest_sw_core_header_footer.mk @@ -70,4 +70,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_header_footer, \ svx \ )) +$(eval $(call gb_CppunitTest_add_arguments,sw_core_header_footer, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_filter_ww8.mk b/sw/CppunitTest_sw_filter_ww8.mk index 712c5b99f42d..b533c7585bfe 100644 --- a/sw/CppunitTest_sw_filter_ww8.mk +++ b/sw/CppunitTest_sw_filter_ww8.mk @@ -73,4 +73,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_filter_ww8, \ $(eval $(call gb_CppunitTest_use_more_fonts,sw_filter_ww8)) +$(eval $(call gb_CppunitTest_add_arguments,sw_filter_ww8, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_layoutwriter5.mk b/sw/CppunitTest_sw_layoutwriter5.mk index ce9d6f7e0144..85fb6e78c0ef 100644 --- a/sw/CppunitTest_sw_layoutwriter5.mk +++ b/sw/CppunitTest_sw_layoutwriter5.mk @@ -11,4 +11,8 @@ $(eval $(call sw_layoutwriter_test,5)) +$(eval $(call gb_CppunitTest_add_arguments,sw_layoutwriter5, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxml_theme_export.mk b/sw/CppunitTest_sw_ooxml_theme_export.mk index 372024309f03..1f477fa165f4 100644 --- a/sw/CppunitTest_sw_ooxml_theme_export.mk +++ b/sw/CppunitTest_sw_ooxml_theme_export.mk @@ -54,4 +54,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) $(eval $(call gb_CppunitTest_set_non_application_font_use,sw_ooxml_theme_export,abort)) endif +$(eval $(call gb_CppunitTest_add_arguments,sw_ooxml_theme_export, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk b/sw/CppunitTest_sw_ooxmlimport2.mk index 89dd74ff40d1..d201424ef1ab 100644 --- a/sw/CppunitTest_sw_ooxmlimport2.mk +++ b/sw/CppunitTest_sw_ooxmlimport2.mk @@ -77,4 +77,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlimport2,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport2)) +$(eval $(call gb_CppunitTest_add_arguments,sw_ooxmlimport2, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmllinks.mk b/sw/CppunitTest_sw_ooxmllinks.mk index 9d84eea863b6..5b3571419464 100644 --- a/sw/CppunitTest_sw_ooxmllinks.mk +++ b/sw/CppunitTest_sw_ooxmllinks.mk @@ -54,4 +54,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) $(eval $(call gb_CppunitTest_set_non_application_font_use,sw_ooxmllinks,abort)) endif +$(eval $(call gb_CppunitTest_add_arguments,sw_ooxmllinks, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk index 5d47c6ba0345..0c030041901e 100644 --- a/sw/CppunitTest_sw_ooxmlw14export.mk +++ b/sw/CppunitTest_sw_ooxmlw14export.mk @@ -50,4 +50,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) $(eval $(call gb_CppunitTest_set_non_application_font_use,sw_ooxmlw14export,abort)) endif +$(eval $(call gb_CppunitTest_add_arguments,sw_ooxmlw14export, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/xmloff/CppunitTest_xmloff_style.mk b/xmloff/CppunitTest_xmloff_style.mk index d2edb42986b9..b0395d8dbadb 100644 --- a/xmloff/CppunitTest_xmloff_style.mk +++ b/xmloff/CppunitTest_xmloff_style.mk @@ -48,4 +48,8 @@ $(eval $(call gb_CppunitTest_use_custom_headers,xmloff_style,\ $(eval $(call gb_CppunitTest_use_configuration,xmloff_style)) +$(eval $(call gb_CppunitTest_add_arguments,xmloff_style, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + # vim: set noet sw=4 ts=4:
