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 /unotest | |
| 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 'unotest')
| -rw-r--r-- | unotest/source/python/org/libreoffice/unotest.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 38c6b2266b31..13b00845bb36 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -182,9 +182,6 @@ class UnoInProcess: global havePonies if not(havePonies): pyuno.private_initTestEnvironment() - # note: this will be called early enough, from Py_Finalize - import atexit - atexit.register(pyuno.private_initTestEnvironment, False) havePonies = True def openEmptyWriterDoc(self): assert(self.xContext) |