From 81e4be9cd39f1ae794a96471bf48637312a0f781 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 20 Feb 2018 17:48:46 +0100 Subject: gpgmepp,xmlsecurity: fix testODFEncryptedGPG() failure caused... ...by CppunitTest setting LD_LIBRARY_PATH to include instdir/program. This causes the spawned gpg-agent to load instdir/program/libassuan.so.0 instead of /usr/... and fail with: writev(2, [{iov_base="gpg-agent", iov_len=9}, {iov_base=": ", iov_len=2}, {iov_base="relocation error", iov_len=16}, {iov_base=": ", iov_len=2}, {iov_base="gpg-agent", iov_len=9}, {iov_base=": ", iov_len=2}, {iov_base="symbol assuan_sock_set_system_ho"..., iov_len=118}, {iov_base="", iov_len=0}, {iov_base="", iov_len=0}, {iov_base="\n", iov_len=1}], 10) = 159 The failure happens in the libreoffice-6-0 branch on Fedora 27, whereas the master branch doesn't fail because it has a newer version of libassuan that happens to provide the required symbol. Fix this by applying the patch that was added for ASAN in d15f042abd5a1093984a0c8380837145f38c4efc to clear LD_LIBRARY_PATH always on Linux. Change-Id: I6a5c7fdfdd32234f39a182581b03d79739880c11 Reviewed-on: https://gerrit.libreoffice.org/50056 Tested-by: Jenkins Reviewed-by: Michael Stahl --- xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk index bad092e6675b..c382e3b09e75 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk @@ -52,12 +52,11 @@ ifeq ($(ENABLE_PDFIMPORT),TRUE) $(eval $(call gb_CppunitTest_use_executable,xmlsecurity_signing,xpdfimport)) endif -ifeq ($(ENABLE_RUNTIME_OPTIMIZATIONS),) +# reset the LD_LIBRARY_PATH for spawned GPG processes ifeq ($(OS),LINUX) $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ EXTRA_ENV_VARS := \ LIBO_LD_PATH=$$LD_LIBRARY_PATH endif -endif # vim: set noet sw=4 ts=4: -- cgit