diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-18 10:53:47 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-03-18 11:27:04 +0000 |
| commit | 198b6c16e78b3462217c9d8a0429459abe885392 (patch) | |
| tree | b276b23ddb1da669651ac99b330df1de294123a5 /test | |
| parent | 415059bddf329feaf3a7b769e70f8641bdfffca6 (diff) | |
Fix MSVC hang in ThreadPool::shutdown()
This is the vclbootstrapprotector.cxx part of
9899ffd244dd367ba69dffe1f21f4f0222064a46, which unblocks
hanging unit tests on a number of VS2015 tinderbox hosts
Change-Id: I6dcfd5a85c078953f0dc6fba0311d9e750f8ce5e
Reviewed-on: https://gerrit.libreoffice.org/35393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/vclbootstrapprotector.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx index 38c51d990922..2218c8fff2c0 100644 --- a/test/source/vclbootstrapprotector.cxx +++ b/test/source/vclbootstrapprotector.cxx @@ -14,6 +14,7 @@ #include <sal/types.h> #include <test/setupvcl.hxx> #include <vcl/svapp.hxx> +#include <comphelper/threadpool.hxx> #include <isheadless.hxx> @@ -28,6 +29,8 @@ public: private: virtual ~Protector() override { DeInitVCL(); + // for the 6 tests that use it + comphelper::ThreadPool::getSharedOptimalPool().shutdown(); } virtual bool protect( |