summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-13 09:17:21 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-13 12:11:04 +0100
commit3902bb7a45f6266c51e01eddcda4e25b34814957 (patch)
treee011f64cdfcc37975efd5497155f138813caad34 /pyuno
parent9d778261d4dd6e50e6c5f7583c4dfa5f8d5b5a0b (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 'pyuno')
-rw-r--r--pyuno/source/module/pyuno_module.cxx21
1 files changed, 5 insertions, 16 deletions
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 93a58111f6ae..40ed69e0191b 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -318,7 +318,7 @@ static PyObject* getComponentContext(
}
static PyObject* initTestEnvironment(
- SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject* args)
+ SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject*)
{
// this tries to bootstrap enough of the soffice from python to run
// unit tests, which is only possible indirectly because pyuno is URE
@@ -349,21 +349,10 @@ static PyObject* initTestEnvironment(
mod.load(OStringToOUString(libname, osl_getThreadTextEncoding()),
SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
if (!mod.is()) { abort(); }
- assert(PyTuple_Check(args));
- if (PyTuple_Size(args) == 0)
- {
- oslGenericFunction const pFunc(
- mod.getFunctionSymbol("test_init"));
- if (!pFunc) { abort(); }
- reinterpret_cast<void (SAL_CALL *)(XMultiServiceFactory*)>(pFunc)(xMSF.get());
- }
- else
- {
- oslGenericFunction const pFunc(
- mod.getFunctionSymbol("test_fini"));
- if (!pFunc) { abort(); }
- reinterpret_cast<void (SAL_CALL *)()>(pFunc)();
- }
+ oslGenericFunction const pFunc(
+ mod.getFunctionSymbol("test_init"));
+ if (!pFunc) { abort(); }
+ reinterpret_cast<void (SAL_CALL *)(XMultiServiceFactory*)>(pFunc)(xMSF.get());
}
catch (const css::uno::Exception &)
{