[Libreoffice-commits] core.git: desktop/source libreofficekit/Module_libreofficekit.mk

[Michael Stahl]

 desktop/source/lib/init.cxx             |    2 ++
 libreofficekit/Module_libreofficekit.mk |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4f05fdffbe4483ae0a466a6460b63560c3fb45ca
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Oct 20 22:14:39 2017 +0200

    tdf#113311 disable CppunitTest_libreofficekit_tiledrendering for now
    
    Change-Id: I0f6e284d232388019bfa33f07a4afc864e0040a9

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d84e09c9c7d9..b731f08fb426 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3557,6 +3557,8 @@ static void lo_destroy(LibreOfficeKit* pThis)
 
     comphelper::LibreOfficeKit::setStatusIndicatorCallback(nullptr, nullptr);
     uno::Reference <frame::XDesktop2> xDesktop = frame::Desktop::create ( ::comphelper::getProcessComponentContext() );
+    // FIXME: the terminate() call here is a no-op because it detects
+    // that LibreOfficeKit::isActive() and then returns early!
     bSuccess = xDesktop.is() && xDesktop->terminate();
 
     if (!bSuccess)
diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
index cc842b2f3f2c..c74c0681328e 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -15,7 +15,8 @@ $(eval $(call gb_Module_add_check_targets,libreofficekit, \
     CppunitTest_libreofficekit_checkapi \
 ))
 
-$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
+# tdf#113311 disabled because it can deadlock on shutdown
+#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
     CppunitTest_libreofficekit_tiledrendering \
 ))