Fix some main/sal unit tests on Windows, remove unneeded OOO_SUBSEQUENT_TESTS,

and run all that pass during the build.

9 files changed, 51 insertions, 35 deletions

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index aae9858f0e7b..4dfd5621205d 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -14,13 +14,24 @@ sa	sal\qa                                  nmake   -   all sa_qa sa_util sa_cppr
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
 sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
-sa	sal\qa\sal								nmake	-	all	sa_qa_sal sa_util  sa_cpprt.u NULL
-sa	sal\qa\osl\condition					nmake	-	all	sa_qa_osl_condition sa_util sa_cpprt.u NULL
-sa	sal\qa\osl\pipe							nmake	-	all	sa_qa_osl_pipe sa_util  sa_cpprt.u NULL
 sa	sal\qa\ByteSequence						nmake	-	all	sa_qa_ByteSequence sa_util sa_cpprt.u NULL
 sa	sal\qa\OStringBuffer					nmake	-	all	sa_qa_OStringBuffer sa_util sa_cpprt.u NULL
+sa	sal\qa\sal								nmake	-	all	sa_qa_sal sa_util  sa_cpprt.u NULL
+sa	sal\qa\osl\condition					nmake	-	all	sa_qa_osl_condition sa_util sa_cpprt.u NULL
 sa	sal\qa\osl\mutex						nmake	-	all	sa_qa_osl_mutex sa_util sa_cpprt.u NULL
+sa	sal\qa\osl\pipe							nmake	-	all	sa_qa_osl_pipe sa_util  sa_cpprt.u NULL
 sa	sal\qa\osl\profile						nmake	-	all	sa_qa_osl_profile sa_util sa_cpprt.u NULL
 sa	sal\qa\osl\setthreadname				nmake	-	all	sa_qa_osl_setthreadname sa_util sa_cpprt.u NULL
 sa	sal\qa\osl\thread						nmake	-	all	sa_qa_osl_thread sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\alloc						nmake	-	all	sa_qa_rtl_alloc sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\cipher						nmake	-	all	sa_qa_rtl_cipher sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\crc32						nmake	-	all	sa_qa_rtl_crc32 sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\digest						nmake	-	all	sa_qa_rtl_digest sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\doublelock					nmake	-	all	sa_qa_rtl_doublelock sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\locale						nmake	-	all	sa_qa_rtl_locale sa_util sa_cpprt.u NULL
 sa	sal\qa\rtl\math							nmake	-	all	sa_qa_rtl_math sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\oustringbuffer				nmake	-	all	sa_qa_rtl_oustringbuffer sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\process						nmake	-	all	sa_qa_rtl_process sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\random						nmake	-	all	sa_qa_rtl_random sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\uri							nmake	-	all	sa_qa_rtl_uri sa_util sa_cpprt.u NULL
+sa	sal\qa\rtl\uuid							nmake	-	all	sa_qa_rtl_uuid sa_util sa_cpprt.u NULL
diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk
index 52d90b9e52af..d5f2849ee654 100644
--- a/sal/qa/osl/mutex/makefile.mk
+++ b/sal/qa/osl/mutex/makefile.mk
@@ -21,10 +21,6 @@
 
 
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ=..$/..$/..
 
 PRJNAME=sal
@@ -65,5 +61,3 @@ APP1TEST = enabled
 .INCLUDE :  target.mk
 
 .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
-
-.END
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index ba3d7225dd8b..e5a6a419dc2f 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -30,6 +30,13 @@
 #include "gtest/gtest.h"
 #include <osl_Mutex_Const.h>
 
+#ifdef WNT
+#include <tools/prewin.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <tools/postwin.h>
+#endif
+
 using namespace osl;
 using namespace rtl;
 
@@ -111,7 +118,7 @@ public:
 
     ~IncreaseThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#IncreaseThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#IncreaseThread does not shutdown properly.\n";
     }
 protected:
     struct resource *pResource;
@@ -139,7 +146,7 @@ public:
 
     ~DecreaseThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#DecreaseThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#DecreaseThread does not shutdown properly.\n";
     }
 protected:
     struct resource *pResource;
@@ -177,7 +184,7 @@ public:
 
     ~PutThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#PutThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#PutThread does not shutdown properly.\n";
     }
 protected:
     struct chain* pChain;
@@ -215,7 +222,7 @@ public:
 
     ~HoldThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#HoldThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#HoldThread does not shutdown properly.\n";
     }
 protected:
     Mutex* pMyMutex;
@@ -237,7 +244,7 @@ public:
 
     ~WaitThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#WaitThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#WaitThread does not shutdown properly.\n";
     }
 protected:
     Mutex* pMyMutex;
@@ -261,7 +268,7 @@ public:
 
     ~GlobalMutexThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#GlobalMutexThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#GlobalMutexThread does not shutdown properly.\n";
     }
 protected:
     void SAL_CALL run( )
@@ -562,7 +569,7 @@ public:
 
     ~GuardThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#GuardThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#GuardThread does not shutdown properly.\n";
     }
 protected:
     Mutex* pMyMutex;
@@ -640,7 +647,7 @@ public:
 
     ~ClearGuardThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#ClearGuardThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#ClearGuardThread does not shutdown properly.\n";
     }
 protected:
     Mutex* pMyMutex;
@@ -767,7 +774,7 @@ public:
 
     ~ResetGuardThread( )
     {
-        ASSERT_TRUE(sal_False == this -> isRunning( )) << "#ResetGuardThread does not shutdown properly.\n";
+        EXPECT_TRUE(sal_False == this -> isRunning( )) << "#ResetGuardThread does not shutdown properly.\n";
     }
 protected:
     Mutex* pMyMutex;
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk
index 34f2cec7f6c4..8acaa8c18b8b 100644
--- a/sal/qa/osl/profile/makefile.mk
+++ b/sal/qa/osl/profile/makefile.mk
@@ -21,10 +21,6 @@
 
 
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ=..$/..$/..
 
 PRJNAME=sal
@@ -60,5 +56,3 @@ APP1TEST = enabled
 .INCLUDE :  target.mk
 
 .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
-
-.END
diff --git a/sal/qa/osl/setthreadname/makefile.mk b/sal/qa/osl/setthreadname/makefile.mk
index 6beca9a19078..2bb7d3b9191e 100644
--- a/sal/qa/osl/setthreadname/makefile.mk
+++ b/sal/qa/osl/setthreadname/makefile.mk
@@ -21,10 +21,6 @@
 
 
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ = ..$/..$/..
 PRJNAME = sal
 TARGET = qa_osl_setthreadname
@@ -48,5 +44,3 @@ APP1TEST = enabled
 .INCLUDE: target.mk
 
 .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
-
-.END
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 889374980953..19e88ce0b897 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -32,6 +32,13 @@
 #include <stdlib.h>
 #include <algorithm> // STL
 
+#ifdef WNT
+#define WIN32_LEAN_AND_MEAN
+#include <tools/prewin.h>
+#include <windows.h>
+#include <tools/postwin.h>
+#endif
+
 #include "gtest/gtest.h"
 //#include "stringhelper.hxx"
 //#include "valueequal.hxx"
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index a5077a7adb64..80987b0a8d3b 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -40,6 +40,13 @@
 
 #include "gtest/gtest.h"
 
+#ifdef WNT
+#define WIN32_LEAN_AND_MEAN
+#include <tools/prewin.h>
+#include <windows.h>
+#include <tools/postwin.h>
+#endif
+
 // -----------------------------------------------------------------------------
 #define CONST_TEST_STRING "gregorian"
 
diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk
index 206c9de9f584..81f8d1139fe2 100644
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@ -21,10 +21,6 @@
 
 
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ = ../../..
 PRJNAME = sal
 TARGET = qa_rtl_profile
@@ -50,4 +46,3 @@ APP1TEST = enabled
 
 .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
 
-.END # "$(OOO_SUBSEQUENT_TESTS)" == ""
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 42a6eed2ac41..ca0abfb53d17 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -31,6 +31,13 @@
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
+#ifdef WNT
+#define WIN32_LEAN_AND_MEAN
+#include <tools/prewin.h>
+#include <windows.h>
+#include <tools/postwin.h>
+#endif
+
 #ifdef UNX
 #include <unistd.h>
 #include <time.h>