[Libreoffice-commits] core.git: xmloff/CppunitTest_xmloff_text.mk

[Michael Stahl (via logerrit)]

 xmloff/CppunitTest_xmloff_text.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 4db18506b43a63af36767d609a762f8d2e3b7634
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Wed Aug 11 11:38:55 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Wed Aug 11 18:36:36 2021 +0200

    xmloff: work around LD_LIBRARY_PATH breaking odfvalidator
    
    Validator calls ResourceBundle.getBundle("com.sun.msv.reader.Messages")
    which can't find the com/sun/msv/reader/Messages.properties in its jar.
    
    bootstrapfixture.cxx:241:Assertion
    Test name: testBibliographyLocalUrl::TestBody
    forced failure
    - /lo/master/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng[-1,-1]:  Error: Can't find bundle for base name com.sun.msv.reader.Messages, locale en_US
    
    This is triggered by gb_CppunitTest_CPPTESTPRECOMMAND.
    
    No idea how this happens, or why it started to happen sometime during
    the last ~4 weeks, but propagating the same workaround of commit
    e854abe076155fc085b56549ced50b3ee9a095d2 to more tests seems to fix it.
    
    Change-Id: Iaef2b41f81c4a659e66cfb7a40f7b1a4517552c3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120322
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/xmloff/CppunitTest_xmloff_text.mk b/xmloff/CppunitTest_xmloff_text.mk
index 8e757fd584b2..14640cf8d7d7 100644
--- a/xmloff/CppunitTest_xmloff_text.mk
+++ b/xmloff/CppunitTest_xmloff_text.mk
@@ -42,4 +42,8 @@ $(eval $(call gb_CppunitTest_use_custom_headers,xmloff_text,\
 
 $(eval $(call gb_CppunitTest_use_configuration,xmloff_text))
 
+$(eval $(call gb_CppunitTest_add_arguments,xmloff_text, \
+    -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: