chart2/CppunitTest_chart2_geometry.mk | 4 ++++ sc/CppunitTest_sc_macros_test.mk | 4 ++++ sc/CppunitTest_sc_shapetest.mk | 4 ++++ sc/CppunitTest_sc_uicalc.mk | 4 ++++ sd/CppunitTest_sd_uiimpress.mk | 4 ++++ sw/CppunitTest_sw_macros_test.mk | 4 ++++ 6 files changed, 24 insertions(+)
New commits: commit 5e43ccb27584d98699e2b2e06658d5b52ebcdff7 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Oct 26 15:01:00 2022 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Oct 26 21:22:53 2022 +0200 More CppunitTests need the ASan hack ...from e854abe076155fc085b56549ced50b3ee9a095d2 "Avoid external processes picking up instdir/program/libnspr4.so", after Xisco's recent CppunitTest clean- up Change-Id: Ia47e770a439af3476f81f8c28f2527bbf144baa4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141890 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/chart2/CppunitTest_chart2_geometry.mk b/chart2/CppunitTest_chart2_geometry.mk index 9b9ff34b5335..1b31bf9d7269 100644 --- a/chart2/CppunitTest_chart2_geometry.mk +++ b/chart2/CppunitTest_chart2_geometry.mk @@ -134,6 +134,10 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,chart2_geometry, \ $(eval $(call gb_CppunitTest_use_configuration,chart2_geometry)) +$(eval $(call gb_CppunitTest_add_arguments,chart2_geometry, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + $(call gb_CppunitTest_get_target,chart2_geometry): $(call gb_Package_get_target,postprocess_images) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index a6dd427cde67..e505f721396f 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -79,4 +79,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sc_macros_test,services)) $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test)) +$(eval $(call gb_CppunitTest_add_arguments,sc_macros_test, \ + -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_shapetest.mk b/sc/CppunitTest_sc_shapetest.mk index 9ca17f2512c0..e8dde4042409 100644 --- a/sc/CppunitTest_sc_shapetest.mk +++ b/sc/CppunitTest_sc_shapetest.mk @@ -53,4 +53,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_shapetest,\ $(eval $(call gb_CppunitTest_use_configuration,sc_shapetest)) +$(eval $(call gb_CppunitTest_add_arguments,sc_shapetest, \ + -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_uicalc.mk b/sc/CppunitTest_sc_uicalc.mk index da0326757b46..af23c8b38966 100644 --- a/sc/CppunitTest_sc_uicalc.mk +++ b/sc/CppunitTest_sc_uicalc.mk @@ -53,4 +53,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sc_uicalc,services)) $(eval $(call gb_CppunitTest_use_configuration,sc_uicalc)) +$(eval $(call gb_CppunitTest_add_arguments,sc_uicalc, \ + -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/sd/CppunitTest_sd_uiimpress.mk b/sd/CppunitTest_sd_uiimpress.mk index e7ee786e98ba..2599d0a97982 100644 --- a/sd/CppunitTest_sd_uiimpress.mk +++ b/sd/CppunitTest_sd_uiimpress.mk @@ -84,4 +84,8 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sd_uiimpress,\ $(eval $(call gb_CppunitTest_use_configuration,sd_uiimpress)) +$(eval $(call gb_CppunitTest_add_arguments,sd_uiimpress, \ + -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_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 74887fa70ea3..a0be4e6cd27f 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -73,4 +73,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_macros_test,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test)) +$(eval $(call gb_CppunitTest_add_arguments,sw_macros_test, \ + -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:
