chart2/CppunitTest_chart2_import2.mk | 4 ++++ sc/CppunitTest_sc_solverobj.mk | 4 ++++ svx/CppunitTest_svx_unit.mk | 4 ++++ sw/CppunitTest_sw_core_unocore.mk | 4 ++++ sw/CppunitTest_sw_htmlexport.mk | 4 ++++ sw/CppunitTest_sw_layoutwriter3.mk | 4 ++++ sw/CppunitTest_sw_uibase_fldui.mk | 4 ++++ sw/CppunitTest_sw_uibase_uiview.mk | 4 ++++ sw/CppunitTest_sw_unowriter.mk | 4 ++++ unoxml/CppunitTest_unoxml_rdftest.mk | 4 ++++ xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk | 4 ++++ 11 files changed, 44 insertions(+)
New commits: commit 41bf66d08b081a9b9033f5f2650273770483f6ce Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Feb 3 12:14:58 2026 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Tue Feb 3 14:38:48 2026 +0100 Even more CppunitTests need the ASan hack now ...from e854abe076155fc085b56549ced50b3ee9a095d2 "Avoid external processes picking up instdir/program/libnspr4.so" Change-Id: I27c1a872b35270d013b979911b137eddd588966f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198591 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins diff --git a/chart2/CppunitTest_chart2_import2.mk b/chart2/CppunitTest_chart2_import2.mk index 0e4a967de557..54f9308cfff7 100644 --- a/chart2/CppunitTest_chart2_import2.mk +++ b/chart2/CppunitTest_chart2_import2.mk @@ -11,4 +11,8 @@ $(eval $(call chart2_import_test,2)) +$(eval $(call gb_CppunitTest_add_arguments,chart2_import2, \ + -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/sc/CppunitTest_sc_solverobj.mk b/sc/CppunitTest_sc_solverobj.mk index 403e0774f8ed..c13049c7f57d 100644 --- a/sc/CppunitTest_sc_solverobj.mk +++ b/sc/CppunitTest_sc_solverobj.mk @@ -11,4 +11,8 @@ $(eval $(call sc_unoapi_common,solverobj)) +$(eval $(call gb_CppunitTest_add_arguments,sc_solverobj, \ + -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/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk index 0cad5af02c26..cb3d90fb739d 100644 --- a/svx/CppunitTest_svx_unit.mk +++ b/svx/CppunitTest_svx_unit.mk @@ -67,4 +67,8 @@ $(eval $(call gb_CppunitTest_use_vcl,svx_unit)) $(eval $(call gb_CppunitTest_use_rdb,svx_unit,services)) $(eval $(call gb_CppunitTest_use_configuration,svx_unit)) +$(eval $(call gb_CppunitTest_add_arguments,svx_unit, \ + -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_core_unocore.mk b/sw/CppunitTest_sw_core_unocore.mk index abdad82fa74b..d6275fe469fd 100644 --- a/sw/CppunitTest_sw_core_unocore.mk +++ b/sw/CppunitTest_sw_core_unocore.mk @@ -77,4 +77,8 @@ $(call gb_CppunitTest_get_target,sw_core_unocore): \ $(eval $(call gb_CppunitTest_use_more_fonts,sw_core_unocore)) +$(eval $(call gb_CppunitTest_add_arguments,sw_core_unocore, \ + -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_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index 3d1f9faee978..828f58494701 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -79,4 +79,8 @@ endif $(eval $(call gb_CppunitTest_use_more_fonts,sw_htmlexport)) +$(eval $(call gb_CppunitTest_add_arguments,sw_htmlexport, \ + -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_layoutwriter3.mk b/sw/CppunitTest_sw_layoutwriter3.mk index 5c4521e02cbd..0c33c59ca480 100644 --- a/sw/CppunitTest_sw_layoutwriter3.mk +++ b/sw/CppunitTest_sw_layoutwriter3.mk @@ -11,4 +11,8 @@ $(eval $(call sw_layoutwriter_test,3)) +$(eval $(call gb_CppunitTest_add_arguments,sw_layoutwriter3, \ + -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_uibase_fldui.mk b/sw/CppunitTest_sw_uibase_fldui.mk index 4939578d4ec5..462d8cfc9f0e 100644 --- a/sw/CppunitTest_sw_uibase_fldui.mk +++ b/sw/CppunitTest_sw_uibase_fldui.mk @@ -76,4 +76,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) $(eval $(call gb_CppunitTest_set_non_application_font_use,sw_uibase_fldui,abort)) endif +$(eval $(call gb_CppunitTest_add_arguments,sw_uibase_fldui, \ + -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_uibase_uiview.mk b/sw/CppunitTest_sw_uibase_uiview.mk index 6cf98a03d7cc..5a55462a411d 100644 --- a/sw/CppunitTest_sw_uibase_uiview.mk +++ b/sw/CppunitTest_sw_uibase_uiview.mk @@ -78,4 +78,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) $(eval $(call gb_CppunitTest_set_non_application_font_use,sw_uibase_uiview,abort)) endif +$(eval $(call gb_CppunitTest_add_arguments,sw_uibase_uiview, \ + -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_unowriter.mk b/sw/CppunitTest_sw_unowriter.mk index 6be1fb825361..3d23df33c7fe 100644 --- a/sw/CppunitTest_sw_unowriter.mk +++ b/sw/CppunitTest_sw_unowriter.mk @@ -84,4 +84,8 @@ ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) $(eval $(call gb_CppunitTest_set_non_application_font_use,sw_unowriter,abort)) endif +$(eval $(call gb_CppunitTest_add_arguments,sw_unowriter, \ + -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/unoxml/CppunitTest_unoxml_rdftest.mk b/unoxml/CppunitTest_unoxml_rdftest.mk index a42ba472f9be..d0aebd571bff 100644 --- a/unoxml/CppunitTest_unoxml_rdftest.mk +++ b/unoxml/CppunitTest_unoxml_rdftest.mk @@ -38,4 +38,8 @@ $(eval $(call gb_CppunitTest_use_configuration,unoxml_rdftest)) $(eval $(call gb_CppunitTest_use_ure,unoxml_rdftest)) $(eval $(call gb_CppunitTest_use_vcl,unoxml_rdftest)) +$(eval $(call gb_CppunitTest_add_arguments,unoxml_rdftest, \ + -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/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk b/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk index 53691195e997..777dfef1028b 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk @@ -62,4 +62,8 @@ $(eval $(call gb_CppunitTest_use_custom_headers,xmlsecurity_xmlsec,\ $(eval $(call gb_CppunitTest_use_configuration,xmlsecurity_xmlsec)) +$(eval $(call gb_CppunitTest_add_arguments,xmlsecurity_xmlsec, \ + -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:
