Revert "Try to blind-solve cppunittester hangs on Windows"

This reverts commit 1126515226.

Reason for revert: it only took one run after merging the patch to see it
still hangs...

Change-Id: I9235004d0568462b112da7f23bc615f3647f4755
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94677
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2020-05-24 12:30:32 +02:00
parent f2b6f4f00a
commit b3c8859cd2
2 changed files with 4 additions and 10 deletions
-4
View File
@@ -28,10 +28,6 @@ $(eval $(call gb_Executable_add_exception_objects,cppunittester,\
sal/cppunittester/cppunittester \
))
$(eval $(call gb_Executable_use_system_win32_libs,cppunittester,\
ole32 \
))
ifeq ($(COM),MSC)
$(eval $(call gb_Executable_add_ldflags,cppunittester,\
+4 -6
View File
@@ -18,9 +18,10 @@
*/
#ifdef _WIN32
#include <prewin.h>
#include <ole2.h>
#include <postwin.h>
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif
#ifdef UNX
@@ -388,9 +389,6 @@ SAL_IMPLEMENT_MAIN()
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG|_CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
#endif
// Tests may use e.g. OLE or clipboard; initialize COM and appropriate concurrency early
OleInitialize(nullptr);
#endif
std::vector<CppUnit::Protector *> protectors;