[Libreoffice-commits] core.git: test/source

[Michael Stahl]

 test/source/vclbootstrapprotector.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 198b6c16e78b3462217c9d8a0429459abe885392
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Mar 18 10:53:47 2017 +0100

    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 at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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(