diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-13 09:17:21 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-13 12:11:04 +0100 |
| commit | 3902bb7a45f6266c51e01eddcda4e25b34814957 (patch) | |
| tree | e011f64cdfcc37975efd5497155f138813caad34 /test | |
| parent | 9d778261d4dd6e50e6c5f7583c4dfa5f8d5b5a0b (diff) | |
Revert "comphelper: fix MSVC hang in ThreadPool::shutdown()"
As it causes "unopkg.bin:
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/comphelper/source/misc/threadpool.cxx:96:
comphelper::ThreadPool::~ThreadPool(): Assertion `mbTerminate' failed."
in
<https://ci.libreoffice.org/job/lo_gerrit/8283/Config=linux_clang_dbgutil_64/console>
and also locally. Revert till it's clear if that assert() should be a
SAL_WARN() or unopkg has to be fixed.
This reverts commit 9899ffd244dd367ba69dffe1f21f4f0222064a46.
Change-Id: I72902f7da410012340aa8231d84c6871a3f7b976
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/bootstrapfixture.cxx | 7 | ||||
| -rw-r--r-- | test/source/vclbootstrapprotector.cxx | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 5fa01a388c50..c97c0ceed535 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -16,7 +16,6 @@ #include <rtl/bootstrap.hxx> #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/threadpool.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -98,12 +97,6 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory) catch (...) { abort(); } } -// this is called from pyuno -SAL_DLLPUBLIC_EXPORT void test_fini() -{ - ::comphelper::ThreadPool::getSharedOptimalPool().shutdown(); -} - } // extern "C" void test::BootstrapFixture::setUp() diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx index 2218c8fff2c0..38c51d990922 100644 --- a/test/source/vclbootstrapprotector.cxx +++ b/test/source/vclbootstrapprotector.cxx @@ -14,7 +14,6 @@ #include <sal/types.h> #include <test/setupvcl.hxx> #include <vcl/svapp.hxx> -#include <comphelper/threadpool.hxx> #include <isheadless.hxx> @@ -29,8 +28,6 @@ public: private: virtual ~Protector() override { DeInitVCL(); - // for the 6 tests that use it - comphelper::ThreadPool::getSharedOptimalPool().shutdown(); } virtual bool protect( |