*** empty log message ***

2 files changed, 181 insertions, 60 deletions

diff --git a/tests/tests.mak b/tests/tests.mak
index 90ebdc5f0cc..a9e922ea721 100644
--- a/tests/tests.mak
+++ b/tests/tests.mak
@@ -1955,11 +1955,11 @@ LINK32_OBJS= \
 # PROP BASE Target_Dir "SOCK_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "SOCK_Test\Debug"

-# PROP Intermediate_Dir "SOCK_Test\Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Debug"

 # PROP Target_Dir "SOCK_Test"

-OUTDIR=.\SOCK_Test\Debug

-INTDIR=.\SOCK_Test\Debug

+OUTDIR=.\.

+INTDIR=.\Debug

 

 ALL : "$(OUTDIR)\SOCK_Test.exe"

 

@@ -1974,11 +1974,14 @@ CLEAN :
 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

+"$(INTDIR)" :

+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

+

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

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

-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

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

+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

  /Fp"$(INTDIR)/SOCK_Test.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\SOCK_Test\Debug/

+CPP_OBJS=.\Debug/

 CPP_SBRS=.\.

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

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

@@ -2013,11 +2016,11 @@ LINK32_OBJS= \
 # PROP BASE Target_Dir "Message_Block_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Message_Block_Test\Debug"

-# PROP Intermediate_Dir "Message_Block_Test\Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Debug"

 # PROP Target_Dir "Message_Block_Test"

-OUTDIR=.\Message_Block_Test\Debug

-INTDIR=.\Message_Block_Test\Debug

+OUTDIR=.\.

+INTDIR=.\Debug

 

 ALL : "$(OUTDIR)\Message_Block_Test.exe"

 

@@ -2032,11 +2035,14 @@ CLEAN :
 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

+"$(INTDIR)" :

+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

+

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

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

-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

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

+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

  /Fp"$(INTDIR)/Message_Block_Test.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Message_Block_Test\Debug/

+CPP_OBJS=.\Debug/

 CPP_SBRS=.\.

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

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

@@ -2090,6 +2096,9 @@ LINK32_OBJS= \
 # Begin Source File

 

 SOURCE=.\Handle_Set_Test.cpp

+

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

+

 DEP_CPP_HANDL=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2106,8 +2115,6 @@ DEP_CPP_HANDL=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -2115,6 +2122,8 @@ DEP_CPP_HANDL=\
 "$(INTDIR)\Handle_Set_Test.obj" : $(SOURCE) $(DEP_CPP_HANDL) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2125,6 +2134,9 @@ DEP_CPP_HANDL=\
 # Begin Source File

 

 SOURCE=.\Mem_Map_Test.cpp

+

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

+

 DEP_CPP_MEM_M=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2141,8 +2153,6 @@ DEP_CPP_MEM_M=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -2150,6 +2160,8 @@ DEP_CPP_MEM_M=\
 "$(INTDIR)\Mem_Map_Test.obj" : $(SOURCE) $(DEP_CPP_MEM_M) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2160,6 +2172,9 @@ DEP_CPP_MEM_M=\
 # Begin Source File

 

 SOURCE=.\Mutex_Test.cpp

+

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

+

 DEP_CPP_MUTEX=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2251,7 +2266,6 @@ DEP_CPP_MUTEX=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -2263,6 +2277,8 @@ DEP_CPP_MUTEX=\
 "$(INTDIR)\Mutex_Test.obj" : $(SOURCE) $(DEP_CPP_MUTEX) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2273,6 +2289,9 @@ DEP_CPP_MUTEX=\
 # Begin Source File

 

 SOURCE=.\Naming_Test.cpp

+

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

+

 DEP_CPP_NAMIN=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2370,7 +2389,6 @@ DEP_CPP_NAMIN=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -2382,6 +2400,8 @@ DEP_CPP_NAMIN=\
 "$(INTDIR)\Naming_Test.obj" : $(SOURCE) $(DEP_CPP_NAMIN) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2392,6 +2412,9 @@ DEP_CPP_NAMIN=\
 # Begin Source File

 

 SOURCE=.\Reactor_Timer_Test.cpp

+

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

+

 DEP_CPP_REACT=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2483,7 +2506,6 @@ DEP_CPP_REACT=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -2495,6 +2517,8 @@ DEP_CPP_REACT=\
 "$(INTDIR)\Reactor_Timer_Test.obj" : $(SOURCE) $(DEP_CPP_REACT) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2505,6 +2529,9 @@ DEP_CPP_REACT=\
 # Begin Source File

 

 SOURCE=.\Reactors_Test.cpp

+

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

+

 DEP_CPP_REACTO=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2607,7 +2634,6 @@ DEP_CPP_REACTO=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -2619,6 +2645,8 @@ DEP_CPP_REACTO=\
 "$(INTDIR)\Reactors_Test.obj" : $(SOURCE) $(DEP_CPP_REACTO) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2629,6 +2657,9 @@ DEP_CPP_REACTO=\
 # Begin Source File

 

 SOURCE=.\SString_Test.cpp

+

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

+

 DEP_CPP_SSTRI=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2643,8 +2674,6 @@ DEP_CPP_SSTRI=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -2652,6 +2681,8 @@ DEP_CPP_SSTRI=\
 "$(INTDIR)\SString_Test.obj" : $(SOURCE) $(DEP_CPP_SSTRI) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2662,6 +2693,9 @@ DEP_CPP_SSTRI=\
 # Begin Source File

 

 SOURCE=.\Time_Value_Test.cpp

+

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

+

 DEP_CPP_TIME_=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2676,8 +2710,6 @@ DEP_CPP_TIME_=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -2685,6 +2717,8 @@ DEP_CPP_TIME_=\
 "$(INTDIR)\Time_Value_Test.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2695,6 +2729,9 @@ DEP_CPP_TIME_=\
 # Begin Source File

 

 SOURCE=.\Timer_Queue_Test.cpp

+

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

+

 DEP_CPP_TIMER=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2708,6 +2745,8 @@ DEP_CPP_TIMER=\
 	{$(INCLUDE)}"\ace\Log_Record.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\Profile_Timer.h"\

+	{$(INCLUDE)}"\ace\Profile_Timer.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

@@ -2723,7 +2762,8 @@ DEP_CPP_TIMER=\
 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

+	{$(INCLUDE)}"\ace\Timer_Heap.h"\

+	{$(INCLUDE)}"\ace\Timer_List.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

@@ -2733,6 +2773,8 @@ DEP_CPP_TIMER=\
 "$(INTDIR)\Timer_Queue_Test.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2743,6 +2785,9 @@ DEP_CPP_TIMER=\
 # Begin Source File

 

 SOURCE=.\UPIPE_SAP_Test.cpp

+

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

+

 DEP_CPP_UPIPE=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2855,7 +2900,6 @@ DEP_CPP_UPIPE=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -2874,6 +2918,8 @@ DEP_CPP_UPIPE=\
 "$(INTDIR)\UPIPE_SAP_Test.obj" : $(SOURCE) $(DEP_CPP_UPIPE) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2884,6 +2930,9 @@ DEP_CPP_UPIPE=\
 # Begin Source File

 

 SOURCE=.\Priority_Buffer_Test.cpp

+

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

+

 DEP_CPP_PRIOR=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -2975,7 +3024,6 @@ DEP_CPP_PRIOR=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -2987,6 +3035,8 @@ DEP_CPP_PRIOR=\
 "$(INTDIR)\Priority_Buffer_Test.obj" : $(SOURCE) $(DEP_CPP_PRIOR) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -2997,6 +3047,9 @@ DEP_CPP_PRIOR=\
 # Begin Source File

 

 SOURCE=.\Time_Service_Test.cpp

+

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

+

 DEP_CPP_TIME_S=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3013,8 +3066,6 @@ DEP_CPP_TIME_S=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -3022,6 +3073,8 @@ DEP_CPP_TIME_S=\
 "$(INTDIR)\Time_Service_Test.obj" : $(SOURCE) $(DEP_CPP_TIME_S) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3032,6 +3085,9 @@ DEP_CPP_TIME_S=\
 # Begin Source File

 

 SOURCE=.\SPIPE_Test.cpp

+

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

+

 DEP_CPP_SPIPE=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3074,8 +3130,6 @@ DEP_CPP_SPIPE=\
 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -3083,6 +3137,8 @@ DEP_CPP_SPIPE=\
 "$(INTDIR)\SPIPE_Test.obj" : $(SOURCE) $(DEP_CPP_SPIPE) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3093,6 +3149,9 @@ DEP_CPP_SPIPE=\
 # Begin Source File

 

 SOURCE=.\Buffer_Stream_Test.cpp

+

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

+

 DEP_CPP_BUFFE=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3198,7 +3257,6 @@ DEP_CPP_BUFFE=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -3210,6 +3268,8 @@ DEP_CPP_BUFFE=\
 "$(INTDIR)\Buffer_Stream_Test.obj" : $(SOURCE) $(DEP_CPP_BUFFE) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3220,6 +3280,9 @@ DEP_CPP_BUFFE=\
 # Begin Source File

 

 SOURCE=.\Barrier_Test.cpp

+

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

+

 DEP_CPP_BARRI=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3311,7 +3374,6 @@ DEP_CPP_BARRI=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -3323,6 +3385,8 @@ DEP_CPP_BARRI=\
 "$(INTDIR)\Barrier_Test.obj" : $(SOURCE) $(DEP_CPP_BARRI) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3333,6 +3397,9 @@ DEP_CPP_BARRI=\
 # Begin Source File

 

 SOURCE=.\Reader_Writer_Test.cpp

+

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

+

 DEP_CPP_READE=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3342,8 +3409,6 @@ DEP_CPP_READE=\
 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.h"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

@@ -3426,7 +3491,6 @@ DEP_CPP_READE=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -3438,6 +3502,8 @@ DEP_CPP_READE=\
 "$(INTDIR)\Reader_Writer_Test.obj" : $(SOURCE) $(DEP_CPP_READE) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3448,6 +3514,9 @@ DEP_CPP_READE=\
 # Begin Source File

 

 SOURCE=.\Recursive_Mutex_Test.cpp

+

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

+

 DEP_CPP_RECUR=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3541,7 +3610,6 @@ DEP_CPP_RECUR=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -3553,6 +3621,8 @@ DEP_CPP_RECUR=\
 "$(INTDIR)\Recursive_Mutex_Test.obj" : $(SOURCE) $(DEP_CPP_RECUR) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3563,6 +3633,9 @@ DEP_CPP_RECUR=\
 # Begin Source File

 

 SOURCE=.\Task_Test.cpp

+

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

+

 DEP_CPP_TASK_=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3665,7 +3738,6 @@ DEP_CPP_TASK_=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -3677,6 +3749,8 @@ DEP_CPP_TASK_=\
 "$(INTDIR)\Task_Test.obj" : $(SOURCE) $(DEP_CPP_TASK_) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3687,6 +3761,9 @@ DEP_CPP_TASK_=\
 # Begin Source File

 

 SOURCE=.\Thread_Manager_Test.cpp

+

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

+

 DEP_CPP_THREA=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -3778,7 +3855,6 @@ DEP_CPP_THREA=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -3790,6 +3866,8 @@ DEP_CPP_THREA=\
 "$(INTDIR)\Thread_Manager_Test.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3800,6 +3878,9 @@ DEP_CPP_THREA=\
 # Begin Source File

 

 SOURCE=.\TSS_Test.cpp

+

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

+

 DEP_CPP_TSS_T=\

 	".\test_config.h"\

 	".\TSS_Test_Errno.h"\

@@ -3892,7 +3973,6 @@ DEP_CPP_TSS_T=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -3904,6 +3984,8 @@ DEP_CPP_TSS_T=\
 "$(INTDIR)\TSS_Test.obj" : $(SOURCE) $(DEP_CPP_TSS_T) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -3914,6 +3996,9 @@ DEP_CPP_TSS_T=\
 # Begin Source File

 

 SOURCE=.\Thread_Pool_Test.cpp

+

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

+

 DEP_CPP_THREAD=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4016,7 +4101,6 @@ DEP_CPP_THREAD=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -4028,6 +4112,8 @@ DEP_CPP_THREAD=\
 "$(INTDIR)\Thread_Pool_Test.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4038,6 +4124,9 @@ DEP_CPP_THREAD=\
 # Begin Source File

 

 SOURCE=.\Future_Test.cpp

+

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

+

 DEP_CPP_FUTUR=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4147,7 +4236,6 @@ DEP_CPP_FUTUR=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -4159,6 +4247,8 @@ DEP_CPP_FUTUR=\
 "$(INTDIR)\Future_Test.obj" : $(SOURCE) $(DEP_CPP_FUTUR) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4169,6 +4259,9 @@ DEP_CPP_FUTUR=\
 # Begin Source File

 

 SOURCE=.\Tokens_Test.cpp

+

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

+

 DEP_CPP_TOKEN=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4268,7 +4361,6 @@ DEP_CPP_TOKEN=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -4286,6 +4378,8 @@ DEP_CPP_TOKEN=\
 "$(INTDIR)\Tokens_Test.obj" : $(SOURCE) $(DEP_CPP_TOKEN) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4296,6 +4390,9 @@ DEP_CPP_TOKEN=\
 # Begin Source File

 

 SOURCE=.\Message_Queue_Test.cpp

+

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

+

 DEP_CPP_MESSA=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4387,7 +4484,6 @@ DEP_CPP_MESSA=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -4399,6 +4495,8 @@ DEP_CPP_MESSA=\
 "$(INTDIR)\Message_Queue_Test.obj" : $(SOURCE) $(DEP_CPP_MESSA) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4409,6 +4507,9 @@ DEP_CPP_MESSA=\
 # Begin Source File

 

 SOURCE=.\Map_Manager_Test.cpp

+

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

+

 DEP_CPP_MAP_M=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4500,7 +4601,6 @@ DEP_CPP_MAP_M=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -4512,6 +4612,8 @@ DEP_CPP_MAP_M=\
 "$(INTDIR)\Map_Manager_Test.obj" : $(SOURCE) $(DEP_CPP_MAP_M) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4522,6 +4624,9 @@ DEP_CPP_MAP_M=\
 # Begin Source File

 

 SOURCE=.\Pipe_Test.cpp

+

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

+

 DEP_CPP_PIPE_=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4542,8 +4647,6 @@ DEP_CPP_PIPE_=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -4551,6 +4654,8 @@ DEP_CPP_PIPE_=\
 "$(INTDIR)\Pipe_Test.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4561,6 +4666,9 @@ DEP_CPP_PIPE_=\
 # Begin Source File

 

 SOURCE=.\Process_Mutex_Test.cpp

+

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

+

 DEP_CPP_PROCE=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4592,8 +4700,6 @@ DEP_CPP_PROCE=\
 	{$(INCLUDE)}"\ace\Synch_T.i"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -4601,6 +4707,8 @@ DEP_CPP_PROCE=\
 "$(INTDIR)\Process_Mutex_Test.obj" : $(SOURCE) $(DEP_CPP_PROCE) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4611,6 +4719,9 @@ DEP_CPP_PROCE=\
 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory_Test.cpp

+

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

+

 DEP_CPP_SV_SH=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4652,8 +4763,6 @@ DEP_CPP_SV_SH=\
 	{$(INCLUDE)}"\ace\Synch_T.i"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -4661,6 +4770,8 @@ DEP_CPP_SV_SH=\
 "$(INTDIR)\SV_Shared_Memory_Test.obj" : $(SOURCE) $(DEP_CPP_SV_SH) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4671,6 +4782,9 @@ DEP_CPP_SV_SH=\
 # Begin Source File

 

 SOURCE=.\MM_Shared_Memory_Test.cpp

+

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

+

 DEP_CPP_MM_SH=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4705,8 +4819,6 @@ DEP_CPP_MM_SH=\
 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -4714,6 +4826,8 @@ DEP_CPP_MM_SH=\
 "$(INTDIR)\MM_Shared_Memory_Test.obj" : $(SOURCE) $(DEP_CPP_MM_SH) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4724,6 +4838,9 @@ DEP_CPP_MM_SH=\
 # Begin Source File

 

 SOURCE=.\Service_Config_Test.cpp

+

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

+

 DEP_CPP_SERVI=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4815,7 +4932,6 @@ DEP_CPP_SERVI=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -4827,6 +4943,8 @@ DEP_CPP_SERVI=\
 "$(INTDIR)\Service_Config_Test.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4837,6 +4955,9 @@ DEP_CPP_SERVI=\
 # Begin Source File

 

 SOURCE=.\SOCK_Test.cpp

+

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

+

 DEP_CPP_SOCK_=\

 	".\test_config.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -4857,7 +4978,7 @@ DEP_CPP_SOCK_=\
 	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\log_record.h"\

 	{$(INCLUDE)}"\ace\Log_Record.i"\

 	{$(INCLUDE)}"\ace\Malloc.h"\

 	{$(INCLUDE)}"\ace\Malloc.i"\

@@ -4932,7 +5053,6 @@ DEP_CPP_SOCK_=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

@@ -4944,6 +5064,8 @@ DEP_CPP_SOCK_=\
 "$(INTDIR)\SOCK_Test.obj" : $(SOURCE) $(DEP_CPP_SOCK_) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

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

@@ -4974,7 +5096,7 @@ DEP_CPP_MESSAG=\
 	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\log_record.h"\

 	{$(INCLUDE)}"\ace\Log_Record.i"\

 	{$(INCLUDE)}"\ace\Malloc.h"\

 	{$(INCLUDE)}"\ace\Malloc.i"\

@@ -5056,7 +5178,6 @@ DEP_CPP_MESSAG=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Time_Value.i"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.i"\

 	{$(INCLUDE)}"\ace\Token.h"\

diff --git a/tests/tests.mdp b/tests/tests.mdp
index 5ba9894cddd..5ddac077cf9 100644
--- a/tests/tests.mdp
+++ b/tests/tests.mdp