oox/CppunitTest_oox_export.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 7485e13b6a99eedc8730d1a3eb72599213208f26
Author:     Stephan Bergmann <[email protected]>
AuthorDate: Fri Dec 3 10:08:05 2021 +0100
Commit:     Stephan Bergmann <[email protected]>
CommitDate: Fri Dec 3 12:56:03 2021 +0100

    CppunitTest_oox_export needs the ASan LD_LIBRARY_PATH hack now too
    
    ...for CPPUNIT_TEST_NAME=testReferToTheme::TestBody introduced in
    f36767fde87191258ea21f3faac0be6ad79328e0 "PPTX export: handle theme colors 
from
    the doc model for shape text",
    
    > /home/sbergman/lo/core/test/source/bootstrapfixture.cxx:248:(anonymous 
namespace)::testReferToTheme::TestBody
    > equality assertion failed
    > - Expected: 0
    > - Actual  : 256
    > - failed to execute: sh /home/sbergman/lo/core/bin/officeotron.sh 
/home/sbergman/lo/tmp/libtest_oox_export.so1a9v6q.tmp > 
/home/sbergman/lo/tmp/_anonymous_namespace___testReferToTheme__TestBody_1a9v6u.tmp
 2>&1
    > Exception in thread "main" java.lang.UnsatisfiedLinkError: 
/usr/lib/jvm/java-11-openjdk-11.0.13.0.8-2.fc35.x86_64/lib/libsystemconf.so: 
/home/sbergman/lo/core/instdir/program/libnspr4.so: undefined symbol: 
__asan_option_detect_stack_use_after_return
    
    Change-Id: If241bc3aa727c56ae7fa69744957690c722fbb1e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126281
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <[email protected]>

diff --git a/oox/CppunitTest_oox_export.mk b/oox/CppunitTest_oox_export.mk
index 011ce3d2a5de..4fe22bd098b4 100644
--- a/oox/CppunitTest_oox_export.mk
+++ b/oox/CppunitTest_oox_export.mk
@@ -43,4 +43,8 @@ $(eval $(call gb_CppunitTest_use_custom_headers,oox_export,\
 
 $(eval $(call gb_CppunitTest_use_configuration,oox_export))
 
+$(eval $(call gb_CppunitTest_add_arguments,oox_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:

Reply via email to