[Libreoffice-commits] core.git: 2 commits - solenv/gbuild unoxml/source

[Tor Lillqvist]

 solenv/gbuild/CppunitTest.mk |    6 ++++++
 unoxml/source/dom/node.cxx   |    3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c38a4d9ce248b4b3fcc9208b25dfa599fe506ac0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 6 19:30:00 2016 +0200

    Make the CPPUNITTRACE="lldb --" thing work again (on macOS)
    
    It doesn't seem to work (any longer in 10.12) to pass
    DYLD_LIBRARY_PATH in the environment to the process to be run under
    lldb. We need to make lldb execute an explicit 'settings set
    target.env-vars' command. Use a temporary file to pass that command.
    
    I could not figure out where to call the gb_CppunitTest_POSTGDBTRACE
    macro I define, to remove the temporary file, sorry. Help appreciated.
    
    Change-Id: I46bd05f14623639e6ce10112b92ef497cdbb0755

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1e4ed41..9d60a02 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -29,7 +29,13 @@ gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if $(
 
 ifeq ($(strip $(gb_CppunitTest_GDBTRACE)),)
 ifneq ($(strip $(CPPUNITTRACE)),)
+ifneq ($(filter gdb,$(CPPUNITTRACE)),)
 gb_CppunitTest_GDBTRACE := $(subst gdb,gdb -ex "set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))",$(CPPUNITTRACE))
+else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
+dyldpathfile=$(call var2file,$(shell $(gb_MKTEMP)),500,settings set target.env-vars $(gb_CppunitTest_CPPTESTPRECOMMAND))
+gb_CppunitTest_GDBTRACE := $(subst lldb,lldb -s $(dyldpathfile),$(CPPUNITTRACE))
+gb_CppunitTest_POSTGDBTRACE := ; rm -f $(dyldpathfile)
+endif
 gb_CppunitTest__interactive := $(true)
 endif
 endif
commit 367c9550ccbe324ed345ead9c288c9bd2f72ea93
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 6 19:27:44 2016 +0200

    Remove noise SAL_INFO that even crashed when pPrefix was NULL
    
    Not sure why it crashed only on macOS?
    
    Change-Id: I9578d7de39e22ba79950c6b47aad26944a5d0fa2

diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index f955827..50adabe 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -82,9 +82,6 @@ namespace DOM
                 strlen(reinterpret_cast<const char*>(pHref)),
                 RTL_TEXTENCODING_UTF8);
 
-            SAL_INFO("unoxml", "Trying to add namespace " << reinterpret_cast<const char*>(pHref) <<
-                               "(prefix " << reinterpret_cast<const char*>(pPrefix) << ")" );
-
             Context::NamespaceMapType::iterator aIter=
                 io_rContext.maNamespaceMap.find(val);
             if( aIter != io_rContext.maNamespaceMap.end() )