ChangeLogTag:Mon Sep 27 16:05:35 1999 Darrell Brunsch <brunsch@cs.wustl.edu>

5 files changed, 471 insertions, 31 deletions

diff --git a/tests/Object_Manager_Test.dsp b/tests/Object_Manager_Test.dsp
new file mode 100644
index 00000000000..023fec0e103
--- /dev/null
+++ b/tests/Object_Manager_Test.dsp
@@ -0,0 +1,144 @@
+# Microsoft Developer Studio Project File - Name="Object_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

+

+CFG=Object_Manager_Test - Win32 PharLap ETS Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Object_Manager_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Object_Manager_Test.mak" CFG="Object_Manager_Test - Win32 PharLap ETS Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Object_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+

+!IF  "$(CFG)" == "Object_Manager_Test - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Object_Manager_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Debug"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Object_Manager_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Object_Manager_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "Object_Manager_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 PharLap ETS Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Object_Manager_Test\PharLap ETS Debug"

+# PROP BASE Intermediate_Dir "Object_Manager_Test\PharLap ETS Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\ETS_LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "Object_Manager_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Object_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# SUBTRACT LINK32 /pdb:none

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Object_Manager_Test - Win32 Debug"

+# Name "Object_Manager_Test - Win32 Alpha Debug"

+# Name "Object_Manager_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=.\Object_Manager_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# Begin Source File

+

+SOURCE=.\test_config.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/run_tests.bat b/tests/run_tests.bat
index 5abad7cbaa4..e654c2a9bb5 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -67,11 +67,15 @@ call %run_cmd% %dopure% %platform% Atomic_Op_Test
 call %run_cmd% %dopure% %platform% Barrier_Test
 call %run_cmd% %dopure% %platform% Basic_Types_Test
 call %run_cmd% %dopure% %platform% Buffer_Stream_Test
+call %run_cmd% %dopure% %platform% Cache_Map_Manager_Test
+call %run_cmd% %dopure% %platform% Cached_Conn_Test
+call %run_cmd% %dopure% %platform% Cached_Accept_Conn_Test
 call %run_cmd% %dopure% %platform% CDR_Test
 call %run_cmd% %dopure% %platform% Collection_Test
 call %run_cmd% %dopure% %platform% Conn_Test
 call %run_cmd% %dopure% %platform% DLL_Test
 call %run_cmd% %dopure% %platform% DLList_Test
+call %run_cmd% %dopure% %platform% Dynamic_Priority_Test
 call %run_cmd% %dopure% %platform% Enum_Interfaces_Test
 call %run_cmd% %dopure% %platform% Env_Value_Test
 call %run_cmd% %dopure% %platform% Future_Test
@@ -81,18 +85,15 @@ call %run_cmd% %dopure% %platform% Hash_Map_Manager_Test
 call %run_cmd% %dopure% %platform% Hash_Map_Bucket_Iterator_Test
 call %run_cmd% %dopure% %platform% High_Res_Timer_Test
 call %run_cmd% %dopure% %platform% IOStream_Test
-call %run_cmd% %dopure% %platform% Map_Manager_Test
 call %run_cmd% %dopure% %platform% Lazy_Map_Manager_Test
-call %run_cmd% %dopure% %platform% Cache_Map_Manager_Test
-call %run_cmd% %dopure% %platform% Cached_Conn_Test
-call %run_cmd% %dopure% %platform% Cached_Accept_Conn_Test
+call %run_cmd% %dopure% %platform% Map_Manager_Test
 call %run_cmd% %dopure% %platform% Map_Test
 call %run_cmd% %dopure% %platform% Mem_Map_Test
 call %run_cmd% %dopure% %platform% Message_Block_Test
 call %run_cmd% %dopure% %platform% Message_Queue_Notifications_Test
 call %run_cmd% %dopure% %platform% Message_Queue_Test
-call %run_cmd% %dopure% %platform% MT_Reactor_Timer_Test
 call %run_cmd% %dopure% %platform% MM_Shared_Memory_Test
+call %run_cmd% %dopure% %platform% MT_Reactor_Timer_Test
 call %run_cmd% %dopure% %platform% MT_SOCK_Test
 call %run_cmd% %dopure% %platform% Malloc_Test
 call %run_cmd% %dopure% %platform% Naming_Test
@@ -102,7 +103,6 @@ call %run_cmd% %dopure% %platform% Object_Manager_Test
 call %run_cmd% %dopure% %platform% OrdMultiSet_Test
 call %run_cmd% %dopure% %platform% Pipe_Test
 call %run_cmd% %dopure% %platform% Priority_Buffer_Test
-call %run_cmd% %dopure% %platform% Dynamic_Priority_Test
 call %run_cmd% %dopure% %platform% Priority_Reactor_Test
 call %run_cmd% %dopure% %platform% Priority_Task_Test
 call %run_cmd% %dopure% %platform% Process_Mutex_Test
@@ -114,7 +114,6 @@ call %run_cmd% %dopure% %platform% Reactor_Notify_Test
 call %run_cmd% %dopure% %platform% Reactor_Performance_Test
 call %run_cmd% %dopure% %platform% Reactor_Timer_Test
 call %run_cmd% %dopure% %platform% Reader_Writer_Test
-call %run_cmd% %dopure% %platform% Thread_Pool_Reactor_Test
 call %run_cmd% %dopure% %platform% Recursive_Mutex_Test
 call %run_cmd% %dopure% %platform% Reverse_Lock_Test
 call %run_cmd% %dopure% %platform% Semaphore_Test
@@ -131,6 +130,7 @@ call %run_cmd% %dopure% %platform% SV_Shared_Memory_Test
 call %run_cmd% %dopure% %platform% Task_Test
 call %run_cmd% %dopure% %platform% Thread_Manager_Test
 call %run_cmd% %dopure% %platform% Thread_Mutex_Test
+call %run_cmd% %dopure% %platform% Thread_Pool_Reactor_Test
 call %run_cmd% %dopure% %platform% Thread_Pool_Test
 call %run_cmd% %dopure% %platform% Timer_Queue_Test
 call %run_cmd% %dopure% %platform% Timeprobe_Test
diff --git a/tests/tests.dsw b/tests/tests.dsw
index 41b38acf169..33c116870c7 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -63,7 +63,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

+Project: "CDR_File_Test"=.\CDR_File_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -75,7 +75,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_File_Test"=.\CDR_File_Test.dsp - Package Owner=<4>

+Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -99,7 +99,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Lazy_Map_Manager_Test"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Cached_Accept_Conn_Test"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -123,18 +123,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cached_Accept_Conn_Test"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -255,7 +243,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Hash_Map_Bucket_Iterator_Test"=.\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -267,7 +255,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Bucket_Iterator_Test"=.\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>

+Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -303,6 +291,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Lazy_Map_Manager_Test"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "MM_Shared_Memory_Test"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -459,6 +459,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Object_Manager_Test"=.\Object_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -950,3 +962,4 @@ Package=<3>
 }}}

 

 ###############################################################################

+

diff --git a/tests/version_tests/Object_Manager_Test.dsp b/tests/version_tests/Object_Manager_Test.dsp
new file mode 100644
index 00000000000..0cf492586f9
--- /dev/null
+++ b/tests/version_tests/Object_Manager_Test.dsp
@@ -0,0 +1,270 @@
+# Microsoft Developer Studio Project File - Name="Object_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Object_Manager_Test - Win32 DLL Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Object_Manager_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Object_Manager_Test.mak" CFG="Object_Manager_Test - Win32 DLL Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Object_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Object_Manager_Test - Win32 DLL Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Debug"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Debug"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\DLL Debug"

+# PROP Intermediate_Dir ".\DLL Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 DLL Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Release"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Release"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\DLL Release"

+# PROP Intermediate_Dir ".\DLL Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 DLL Unicode Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Unicode Release"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Unicode Release"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\DLL Unicode Release"

+# PROP Intermediate_Dir ".\DLL Unicode Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 static Unicode Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Object_Manager_Test\static Unicode Release"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Unicode Release"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\static Unicode Release"

+# PROP Intermediate_Dir ".\static Unicode Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Object_Manager_Test\static Release"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Release"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\static Release"

+# PROP Intermediate_Dir ".\static Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 DLL Unicode Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Unicode Debug"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Unicode Debug"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\DLL Unicode Debug"

+# PROP Intermediate_Dir ".\DLL Unicode Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Object_Manager_Test\static Debug"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Debug"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\static Debug"

+# PROP Intermediate_Dir ".\static Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 static Unicode Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Object_Manager_Test\static Unicode Debug"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Unicode Debug"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\static Unicode Debug"

+# PROP Intermediate_Dir ".\static Unicode Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_Manager_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Object_Manager_Test - Win32 DLL Debug"

+# Name "Object_Manager_Test - Win32 DLL Release"

+# Name "Object_Manager_Test - Win32 DLL Unicode Release"

+# Name "Object_Manager_Test - Win32 static Unicode Release"

+# Name "Object_Manager_Test - Win32 static Release"

+# Name "Object_Manager_Test - Win32 DLL Unicode Debug"

+# Name "Object_Manager_Test - Win32 static Debug"

+# Name "Object_Manager_Test - Win32 static Unicode Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Object_Manager_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/version_tests.dsw b/tests/version_tests/version_tests.dsw
index 56889916585..07b9cf01377 100644
--- a/tests/version_tests/version_tests.dsw
+++ b/tests/version_tests/version_tests.dsw
@@ -63,7 +63,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

+Project: "CDR_File_Test"=.\CDR_File_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -75,7 +75,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_File_Test"=.\CDR_File_Test.dsp - Package Owner=<4>

+Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -99,7 +99,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cached_Conn_Test"=.\Cached_Conn_Test.dsp - Package Owner=<4>

+Project: "Cached_Accept_Conn_Test"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -111,7 +111,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cached_Accept_Conn_Test"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

+Project: "Cached_Conn_Test"=.\Cached_Conn_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -267,7 +267,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Lazy_Map_Manager_Test"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -279,7 +279,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>

+Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -291,7 +291,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>

+Project: "Lazy_Map_Manager_Test"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -459,6 +459,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Object_Manager_Test"=.\Object_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -950,3 +962,4 @@ Package=<3>
 }}}

 

 ###############################################################################

+