From 013efe75eba3d209a7bd072d608126dac6fa191c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 6 Aug 2015 11:50:29 +0200 Subject: test: hack to avoid VCLXToolkit calling CreateMainLoopThread ... for the PythonTest, similar to what vclbootstrapprotector does for CppunitTest; actually no idea if this is a good idea or a bad idea. Change-Id: Ia4e2e50fdc9c8deb9faf580a2f3f3308533265eb Reviewed-on: https://gerrit.libreoffice.org/17540 Tested-by: Jenkins Reviewed-by: Michael Stahl --- test/source/bootstrapfixture.cxx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index b7ad99b0ad81..e9aefb82e9bf 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -83,6 +84,15 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB, } } +struct InitHook { + DECL_STATIC_LINK(InitHook, deinitHook, void*); +}; + +IMPL_STATIC_LINK_NOARG(InitHook, deinitHook) { + // nothing to do for now + return 0; +} + // this is called from pyuno SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory) { @@ -105,6 +115,9 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory) if (test::isHeadless()) Application::EnableHeadlessMode(true); + // avoid VCLXToolkit thinking that InitVCL hasn't been called + Application::setDeInitHook(LINK(nullptr, InitHook, deinitHook)); + test_init_impl(false, true, pFactory); } catch (...) { abort(); } -- cgit