./tests/Simple_Message_Block_Test.MAK

11 files changed, 0 insertions, 3935 deletions

diff --git a/tests/TSS_Test.MAK b/tests/TSS_Test.MAK
deleted file mode 100644
index 29ab94572cd..00000000000
--- a/tests/TSS_Test.MAK
+++ /dev/null
@@ -1,356 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on TSS_Test.dsp
-!IF "$(CFG)" == ""
-CFG=TSS_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to TSS_Test - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "TSS_Test - Win32 Debug" && "$(CFG)" !=\
- "TSS_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "TSS_Test.mak" CFG="TSS_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "TSS_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "TSS_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\TSS_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\TSS_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\TSS_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\TSS_Test.exe"
-	-@erase "$(OUTDIR)\TSS_Test.ilk"
-	-@erase "$(OUTDIR)\TSS_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\TSS_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\TSS_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\TSS_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\TSS_Test.obj"
-
-"$(OUTDIR)\TSS_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\TSS_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\TSS_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\TSS_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\TSS_Test.exe"
-	-@erase "$(OUTDIR)\TSS_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\TSS_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /pdb:"$(OUTDIR)\TSS_Test.pdb"\
- /debug /machine:ALPHA /out:"$(OUTDIR)\TSS_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\TSS_Test.obj"
-
-"$(OUTDIR)\TSS_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "TSS_Test - Win32 Debug" || "$(CFG)" ==\
- "TSS_Test - Win32 Alpha Debug"
-SOURCE=.\TSS_Test.cpp
-
-!IF  "$(CFG)" == "TSS_Test - Win32 Debug"
-
-DEP_CPP_TSS_T=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	".\TSS_Test_Errno.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\TSS_Test.obj" : $(SOURCE) $(DEP_CPP_TSS_T) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 Alpha Debug"
-
-DEP_CPP_TSS_T=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	".\TSS_Test_Errno.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\TSS_Test.obj" : $(SOURCE) $(DEP_CPP_TSS_T) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Task_Test.MAK b/tests/Task_Test.MAK
deleted file mode 100644
index 4ce4aee82a7..00000000000
--- a/tests/Task_Test.MAK
+++ /dev/null
@@ -1,440 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Task_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Task_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Task_Test - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Task_Test - Win32 Debug" && "$(CFG)" !=\
- "Task_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Task_Test.mak" CFG="Task_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Task_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Task_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Task_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Task_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Task_Test.exe"
-	-@erase "$(OUTDIR)\Task_Test.ilk"
-	-@erase "$(OUTDIR)\Task_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Task_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Task_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Task_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Task_Test.obj"
-
-"$(OUTDIR)\Task_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Task_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Task_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Task_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Task_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Task_Test.exe"
-	-@erase "$(OUTDIR)\Task_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Task_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /pdb:"$(OUTDIR)\Task_Test.pdb"\
- /debug /machine:ALPHA /out:"$(OUTDIR)\Task_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Task_Test.obj"
-
-"$(OUTDIR)\Task_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Task_Test - Win32 Debug" || "$(CFG)" ==\
- "Task_Test - Win32 Alpha Debug"
-SOURCE=.\Task_Test.cpp
-
-!IF  "$(CFG)" == "Task_Test - Win32 Debug"
-
-DEP_CPP_TASK_=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\Hash_Map_Manager.cpp"\
-	"..\ace\Hash_Map_Manager.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\IO_Cntl_Msg.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Message_Block.h"\
-	"..\ace\Message_Block.i"\
-	"..\ace\Message_Queue.cpp"\
-	"..\ace\Message_Queue.h"\
-	"..\ace\Message_Queue.i"\
-	"..\ace\Module.cpp"\
-	"..\ace\Module.h"\
-	"..\ace\Module.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Service_Types.h"\
-	"..\ace\Service_Types.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\Strategies.h"\
-	"..\ace\Strategies_T.cpp"\
-	"..\ace\Strategies_T.h"\
-	"..\ace\Stream_Modules.cpp"\
-	"..\ace\Stream_Modules.h"\
-	"..\ace\Stream_Modules.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Task.h"\
-	"..\ace\Task.i"\
-	"..\ace\Task_T.cpp"\
-	"..\ace\Task_T.h"\
-	"..\ace\Task_T.i"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\WFMO_Reactor.h"\
-	"..\ace\WFMO_Reactor.i"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Task_Test.obj" : $(SOURCE) $(DEP_CPP_TASK_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Task_Test - Win32 Alpha Debug"
-
-DEP_CPP_TASK_=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\Hash_Map_Manager.cpp"\
-	"..\ace\Hash_Map_Manager.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\IO_Cntl_Msg.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Message_Block.h"\
-	"..\ace\Message_Block.i"\
-	"..\ace\Message_Queue.cpp"\
-	"..\ace\Message_Queue.h"\
-	"..\ace\Message_Queue.i"\
-	"..\ace\Module.cpp"\
-	"..\ace\Module.h"\
-	"..\ace\Module.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Service_Types.h"\
-	"..\ace\Service_Types.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\Strategies.h"\
-	"..\ace\Strategies_T.cpp"\
-	"..\ace\Strategies_T.h"\
-	"..\ace\Stream_Modules.cpp"\
-	"..\ace\Stream_Modules.h"\
-	"..\ace\Stream_Modules.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Task.h"\
-	"..\ace\Task.i"\
-	"..\ace\Task_T.cpp"\
-	"..\ace\Task_T.h"\
-	"..\ace\Task_T.i"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\WFMO_Reactor.h"\
-	"..\ace\WFMO_Reactor.i"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Task_Test.obj" : $(SOURCE) $(DEP_CPP_TASK_) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Thread_Manager_Test.MAK b/tests/Thread_Manager_Test.MAK
deleted file mode 100644
index 14099e100d9..00000000000
--- a/tests/Thread_Manager_Test.MAK
+++ /dev/null
@@ -1,360 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Thread_Manager_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Thread_Manager_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Thread_Manager_Test - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Thread_Manager_Test - Win32 Debug" && "$(CFG)" !=\
- "Thread_Manager_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Thread_Manager_Test.mak"\
- CFG="Thread_Manager_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Thread_Manager_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Thread_Manager_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Thread_Manager_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Thread_Manager_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Thread_Manager_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Thread_Manager_Test.exe"
-	-@erase "$(OUTDIR)\Thread_Manager_Test.ilk"
-	-@erase "$(OUTDIR)\Thread_Manager_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Thread_Manager_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Thread_Manager_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Thread_Manager_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Thread_Manager_Test.obj"
-
-"$(OUTDIR)\Thread_Manager_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Thread_Manager_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Thread_Manager_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Thread_Manager_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Thread_Manager_Test.exe"
-	-@erase "$(OUTDIR)\Thread_Manager_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Thread_Manager_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\Thread_Manager_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\Thread_Manager_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Thread_Manager_Test.obj"
-
-"$(OUTDIR)\Thread_Manager_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Thread_Manager_Test - Win32 Debug" || "$(CFG)" ==\
- "Thread_Manager_Test - Win32 Alpha Debug"
-SOURCE=.\Thread_Manager_Test.cpp
-
-!IF  "$(CFG)" == "Thread_Manager_Test - Win32 Debug"
-
-DEP_CPP_THREA=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	".\Thread_Manager_Test.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Thread_Manager_Test.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Debug"
-
-DEP_CPP_THREA=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	".\Thread_Manager_Test.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Thread_Manager_Test.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Thread_Mutex_Test.MAK b/tests/Thread_Mutex_Test.MAK
deleted file mode 100644
index 70e52a1a7e4..00000000000
--- a/tests/Thread_Mutex_Test.MAK
+++ /dev/null
@@ -1,357 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Thread_Mutex_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Thread_Mutex_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Thread_Mutex_Test - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Thread_Mutex_Test - Win32 Debug" && "$(CFG)" !=\
- "Thread_Mutex_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Thread_Mutex_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Thread_Mutex_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Thread_Mutex_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Thread_Mutex_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Thread_Mutex_Test.exe"
-	-@erase "$(OUTDIR)\Thread_Mutex_Test.ilk"
-	-@erase "$(OUTDIR)\Thread_Mutex_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Thread_Mutex_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Thread_Mutex_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Thread_Mutex_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Thread_Mutex_Test.obj"
-
-"$(OUTDIR)\Thread_Mutex_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Thread_Mutex_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Thread_Mutex_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Thread_Mutex_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Thread_Mutex_Test.exe"
-	-@erase "$(OUTDIR)\Thread_Mutex_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Thread_Mutex_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\Thread_Mutex_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\Thread_Mutex_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Thread_Mutex_Test.obj"
-
-"$(OUTDIR)\Thread_Mutex_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Thread_Mutex_Test - Win32 Debug" || "$(CFG)" ==\
- "Thread_Mutex_Test - Win32 Alpha Debug"
-SOURCE=.\Thread_Mutex_Test.cpp
-
-!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"
-
-DEP_CPP_THREA=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Thread_Mutex_Test.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 Alpha Debug"
-
-DEP_CPP_THREA=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Thread_Mutex_Test.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Thread_Pool_Test.MAK b/tests/Thread_Pool_Test.MAK
deleted file mode 100644
index 0d7997bd85c..00000000000
--- a/tests/Thread_Pool_Test.MAK
+++ /dev/null
@@ -1,443 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Thread_Pool_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Thread_Pool_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Thread_Pool_Test - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Thread_Pool_Test - Win32 Debug" && "$(CFG)" !=\
- "Thread_Pool_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Thread_Pool_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Thread_Pool_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Thread_Pool_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Thread_Pool_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Thread_Pool_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Thread_Pool_Test.exe"
-	-@erase "$(OUTDIR)\Thread_Pool_Test.ilk"
-	-@erase "$(OUTDIR)\Thread_Pool_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Thread_Pool_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Thread_Pool_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Thread_Pool_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Thread_Pool_Test.obj"
-
-"$(OUTDIR)\Thread_Pool_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Thread_Pool_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Thread_Pool_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Thread_Pool_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Thread_Pool_Test.exe"
-	-@erase "$(OUTDIR)\Thread_Pool_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Thread_Pool_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\Thread_Pool_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\Thread_Pool_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Thread_Pool_Test.obj"
-
-"$(OUTDIR)\Thread_Pool_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Thread_Pool_Test - Win32 Debug" || "$(CFG)" ==\
- "Thread_Pool_Test - Win32 Alpha Debug"
-SOURCE=.\Thread_Pool_Test.cpp
-
-!IF  "$(CFG)" == "Thread_Pool_Test - Win32 Debug"
-
-DEP_CPP_THREA=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\Hash_Map_Manager.cpp"\
-	"..\ace\Hash_Map_Manager.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\IO_Cntl_Msg.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Message_Block.h"\
-	"..\ace\Message_Block.i"\
-	"..\ace\Message_Queue.cpp"\
-	"..\ace\Message_Queue.h"\
-	"..\ace\Message_Queue.i"\
-	"..\ace\Module.cpp"\
-	"..\ace\Module.h"\
-	"..\ace\Module.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Service_Types.h"\
-	"..\ace\Service_Types.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\Strategies.h"\
-	"..\ace\Strategies_T.cpp"\
-	"..\ace\Strategies_T.h"\
-	"..\ace\Stream_Modules.cpp"\
-	"..\ace\Stream_Modules.h"\
-	"..\ace\Stream_Modules.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Task.h"\
-	"..\ace\Task.i"\
-	"..\ace\Task_T.cpp"\
-	"..\ace\Task_T.h"\
-	"..\ace\Task_T.i"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\WFMO_Reactor.h"\
-	"..\ace\WFMO_Reactor.i"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Thread_Pool_Test.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Debug"
-
-DEP_CPP_THREA=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\Hash_Map_Manager.cpp"\
-	"..\ace\Hash_Map_Manager.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\IO_Cntl_Msg.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Message_Block.h"\
-	"..\ace\Message_Block.i"\
-	"..\ace\Message_Queue.cpp"\
-	"..\ace\Message_Queue.h"\
-	"..\ace\Message_Queue.i"\
-	"..\ace\Module.cpp"\
-	"..\ace\Module.h"\
-	"..\ace\Module.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Service_Types.h"\
-	"..\ace\Service_Types.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\Strategies.h"\
-	"..\ace\Strategies_T.cpp"\
-	"..\ace\Strategies_T.h"\
-	"..\ace\Stream_Modules.cpp"\
-	"..\ace\Stream_Modules.h"\
-	"..\ace\Stream_Modules.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Task.h"\
-	"..\ace\Task.i"\
-	"..\ace\Task_T.cpp"\
-	"..\ace\Task_T.h"\
-	"..\ace\Task_T.i"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\WFMO_Reactor.h"\
-	"..\ace\WFMO_Reactor.i"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Thread_Pool_Test.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Time_Service_Test.MAK b/tests/Time_Service_Test.MAK
deleted file mode 100644
index 0a1a7a23b6c..00000000000
--- a/tests/Time_Service_Test.MAK
+++ /dev/null
@@ -1,295 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Time_Service_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Time_Service_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Time_Service_Test - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Time_Service_Test - Win32 Debug" && "$(CFG)" !=\
- "Time_Service_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Time_Service_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Time_Service_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Time_Service_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Time_Service_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Time_Service_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Time_Service_Test.exe"
-	-@erase "$(OUTDIR)\Time_Service_Test.ilk"
-	-@erase "$(OUTDIR)\Time_Service_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Time_Service_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Time_Service_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Time_Service_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Time_Service_Test.obj"
-
-"$(OUTDIR)\Time_Service_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Time_Service_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Time_Service_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Time_Service_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Time_Service_Test.exe"
-	-@erase "$(OUTDIR)\Time_Service_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Time_Service_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\Time_Service_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\Time_Service_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Time_Service_Test.obj"
-
-"$(OUTDIR)\Time_Service_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Time_Service_Test - Win32 Debug" || "$(CFG)" ==\
- "Time_Service_Test - Win32 Alpha Debug"
-SOURCE=.\Time_Service_Test.cpp
-
-!IF  "$(CFG)" == "Time_Service_Test - Win32 Debug"
-
-DEP_CPP_TIME_=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Process.h"\
-	"..\ace\Process.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Time_Service_Test.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 Alpha Debug"
-
-DEP_CPP_TIME_=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Process.h"\
-	"..\ace\Process.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Time_Service_Test.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Time_Value_Test.MAK b/tests/Time_Value_Test.MAK
deleted file mode 100644
index 20d1e52dfd1..00000000000
--- a/tests/Time_Value_Test.MAK
+++ /dev/null
@@ -1,291 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Time_Value_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Time_Value_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Time_Value_Test - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Time_Value_Test - Win32 Debug" && "$(CFG)" !=\
- "Time_Value_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Time_Value_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Time_Value_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Time_Value_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Time_Value_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Time_Value_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Time_Value_Test.exe"
-	-@erase "$(OUTDIR)\Time_Value_Test.ilk"
-	-@erase "$(OUTDIR)\Time_Value_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Time_Value_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Time_Value_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Time_Value_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Time_Value_Test.obj"
-
-"$(OUTDIR)\Time_Value_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Time_Value_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Time_Value_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Time_Value_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Time_Value_Test.exe"
-	-@erase "$(OUTDIR)\Time_Value_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Time_Value_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\Time_Value_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\Time_Value_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Time_Value_Test.obj"
-
-"$(OUTDIR)\Time_Value_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Time_Value_Test - Win32 Debug" || "$(CFG)" ==\
- "Time_Value_Test - Win32 Alpha Debug"
-SOURCE=.\Time_Value_Test.cpp
-
-!IF  "$(CFG)" == "Time_Value_Test - Win32 Debug"
-
-DEP_CPP_TIME_=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Time_Value_Test.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 Alpha Debug"
-
-DEP_CPP_TIME_=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Time_Value_Test.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Timer_Queue_Test.MAK b/tests/Timer_Queue_Test.MAK
deleted file mode 100644
index 64ff122a5c3..00000000000
--- a/tests/Timer_Queue_Test.MAK
+++ /dev/null
@@ -1,395 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Timer_Queue_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Timer_Queue_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Timer_Queue_Test - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Timer_Queue_Test - Win32 Debug" && "$(CFG)" !=\
- "Timer_Queue_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Timer_Queue_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Timer_Queue_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Timer_Queue_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Timer_Queue_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Timer_Queue_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Timer_Queue_Test.exe"
-	-@erase "$(OUTDIR)\Timer_Queue_Test.ilk"
-	-@erase "$(OUTDIR)\Timer_Queue_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Timer_Queue_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Timer_Queue_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Timer_Queue_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Timer_Queue_Test.obj"
-
-"$(OUTDIR)\Timer_Queue_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Timer_Queue_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Timer_Queue_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Timer_Queue_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Timer_Queue_Test.exe"
-	-@erase "$(OUTDIR)\Timer_Queue_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Timer_Queue_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\Timer_Queue_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\Timer_Queue_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Timer_Queue_Test.obj"
-
-"$(OUTDIR)\Timer_Queue_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Timer_Queue_Test - Win32 Debug" || "$(CFG)" ==\
- "Timer_Queue_Test - Win32 Alpha Debug"
-SOURCE=.\Timer_Queue_Test.cpp
-
-!IF  "$(CFG)" == "Timer_Queue_Test - Win32 Debug"
-
-DEP_CPP_TIMER=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\High_Res_Timer.h"\
-	"..\ace\High_Res_Timer.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Profile_Timer.h"\
-	"..\ace\Profile_Timer.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Time_Value.h"\
-	"..\ace\Timer_Hash.h"\
-	"..\ace\Timer_Hash_T.cpp"\
-	"..\ace\Timer_Hash_T.h"\
-	"..\ace\Timer_Heap.h"\
-	"..\ace\Timer_Heap_T.cpp"\
-	"..\ace\Timer_Heap_T.h"\
-	"..\ace\Timer_List.h"\
-	"..\ace\Timer_List_T.cpp"\
-	"..\ace\Timer_List_T.h"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Timer_Wheel.h"\
-	"..\ace\Timer_Wheel_T.cpp"\
-	"..\ace\Timer_Wheel_T.h"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Timer_Queue_Test.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Debug"
-
-DEP_CPP_TIMER=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\High_Res_Timer.h"\
-	"..\ace\High_Res_Timer.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Profile_Timer.h"\
-	"..\ace\Profile_Timer.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Time_Value.h"\
-	"..\ace\Timer_Hash.h"\
-	"..\ace\Timer_Hash_T.cpp"\
-	"..\ace\Timer_Hash_T.h"\
-	"..\ace\Timer_Heap.h"\
-	"..\ace\Timer_Heap_T.cpp"\
-	"..\ace\Timer_Heap_T.h"\
-	"..\ace\Timer_List.h"\
-	"..\ace\Timer_List_T.cpp"\
-	"..\ace\Timer_List_T.h"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Timer_Wheel.h"\
-	"..\ace\Timer_Wheel_T.cpp"\
-	"..\ace\Timer_Wheel_T.h"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Timer_Queue_Test.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/Tokens_Test.MAK b/tests/Tokens_Test.MAK
deleted file mode 100644
index 75a9904a086..00000000000
--- a/tests/Tokens_Test.MAK
+++ /dev/null
@@ -1,454 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Tokens_Test.dsp
-!IF "$(CFG)" == ""
-CFG=Tokens_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Tokens_Test - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Tokens_Test - Win32 Debug" && "$(CFG)" !=\
- "Tokens_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "Tokens_Test.mak" CFG="Tokens_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Tokens_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Tokens_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Tokens_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Tokens_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Tokens_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Tokens_Test.exe"
-	-@erase "$(OUTDIR)\Tokens_Test.ilk"
-	-@erase "$(OUTDIR)\Tokens_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Tokens_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Tokens_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\Tokens_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Tokens_Test.obj"
-
-"$(OUTDIR)\Tokens_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\Tokens_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\Tokens_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\Tokens_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\Tokens_Test.exe"
-	-@erase "$(OUTDIR)\Tokens_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Tokens_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\Tokens_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\Tokens_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\Tokens_Test.obj"
-
-"$(OUTDIR)\Tokens_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "Tokens_Test - Win32 Debug" || "$(CFG)" ==\
- "Tokens_Test - Win32 Alpha Debug"
-SOURCE=.\Tokens_Test.cpp
-
-!IF  "$(CFG)" == "Tokens_Test - Win32 Debug"
-
-DEP_CPP_TOKEN=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Addr.h"\
-	"..\ace\Addr.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Get_Opt.h"\
-	"..\ace\Get_Opt.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\INET_Addr.h"\
-	"..\ace\INET_Addr.i"\
-	"..\ace\iosfwd.h"\
-	"..\ace\IPC_SAP.h"\
-	"..\ace\IPC_SAP.i"\
-	"..\ace\Local_Tokens.h"\
-	"..\ace\Local_Tokens.i"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Map_Manager.cpp"\
-	"..\ace\Map_Manager.h"\
-	"..\ace\Map_Manager.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Process.h"\
-	"..\ace\Process.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Remote_Tokens.h"\
-	"..\ace\Remote_Tokens.i"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SOCK.h"\
-	"..\ace\SOCK.i"\
-	"..\ace\SOCK_Connector.h"\
-	"..\ace\SOCK_Connector.i"\
-	"..\ace\SOCK_IO.h"\
-	"..\ace\SOCK_IO.i"\
-	"..\ace\SOCK_Stream.h"\
-	"..\ace\SOCK_Stream.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Time_Value.h"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Token_Collection.h"\
-	"..\ace\Token_Collection.i"\
-	"..\ace\Token_Invariants.h"\
-	"..\ace\Token_Invariants.i"\
-	"..\ace\Token_Request_Reply.h"\
-	"..\ace\Token_Request_Reply.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Tokens_Test.obj" : $(SOURCE) $(DEP_CPP_TOKEN) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 Alpha Debug"
-
-DEP_CPP_TOKEN=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Addr.h"\
-	"..\ace\Addr.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Get_Opt.h"\
-	"..\ace\Get_Opt.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\INET_Addr.h"\
-	"..\ace\INET_Addr.i"\
-	"..\ace\iosfwd.h"\
-	"..\ace\IPC_SAP.h"\
-	"..\ace\IPC_SAP.i"\
-	"..\ace\Local_Tokens.h"\
-	"..\ace\Local_Tokens.i"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Map_Manager.cpp"\
-	"..\ace\Map_Manager.h"\
-	"..\ace\Map_Manager.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Process.h"\
-	"..\ace\Process.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Remote_Tokens.h"\
-	"..\ace\Remote_Tokens.i"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SOCK.h"\
-	"..\ace\SOCK.i"\
-	"..\ace\SOCK_Connector.h"\
-	"..\ace\SOCK_Connector.i"\
-	"..\ace\SOCK_IO.h"\
-	"..\ace\SOCK_IO.i"\
-	"..\ace\SOCK_Stream.h"\
-	"..\ace\SOCK_Stream.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Time_Value.h"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Token_Collection.h"\
-	"..\ace\Token_Collection.i"\
-	"..\ace\Token_Invariants.h"\
-	"..\ace\Token_Invariants.i"\
-	"..\ace\Token_Request_Reply.h"\
-	"..\ace\Token_Request_Reply.i"\
-	"..\ace\Trace.h"\
-	"..\ace\Version.h"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\Tokens_Test.obj" : $(SOURCE) $(DEP_CPP_TOKEN) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/UPIPE_SAP_Test.MAK b/tests/UPIPE_SAP_Test.MAK
deleted file mode 100644
index 2e9ba2364c4..00000000000
--- a/tests/UPIPE_SAP_Test.MAK
+++ /dev/null
@@ -1,487 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on UPIPE_SAP_Test.dsp
-!IF "$(CFG)" == ""
-CFG=UPIPE_SAP_Test - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to UPIPE_SAP_Test - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "UPIPE_SAP_Test - Win32 Debug" && "$(CFG)" !=\
- "UPIPE_SAP_Test - Win32 Alpha Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "UPIPE_SAP_Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-RSC=rc.exe
-
-!IF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Debug"
-
-OUTDIR=.\.
-INTDIR=.\DLL\Debug
-# Begin Custom Macros
-OutDir=.\.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\UPIPE_SAP_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\UPIPE_SAP_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\UPIPE_SAP_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\UPIPE_SAP_Test.exe"
-	-@erase "$(OUTDIR)\UPIPE_SAP_Test.ilk"
-	-@erase "$(OUTDIR)\UPIPE_SAP_Test.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\DLL\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\UPIPE_SAP_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\UPIPE_SAP_Test.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\UPIPE_SAP_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\UPIPE_SAP_Test.obj"
-
-"$(OUTDIR)\UPIPE_SAP_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Debug"
-
-OUTDIR=.
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\UPIPE_SAP_Test.exe"
-
-!ELSE 
-
-ALL : "$(OUTDIR)\UPIPE_SAP_Test.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\UPIPE_SAP_Test.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\UPIPE_SAP_Test.exe"
-	-@erase "$(OUTDIR)\UPIPE_SAP_Test.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D\
- "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /MDd /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\UPIPE_SAP_Test.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=aced.lib /nologo /subsystem:console\
- /pdb:"$(OUTDIR)\UPIPE_SAP_Test.pdb" /debug /machine:ALPHA\
- /out:"$(OUTDIR)\UPIPE_SAP_Test.exe" /libpath:"..\ace" 
-LINK32_OBJS= \
-	"$(INTDIR)\UPIPE_SAP_Test.obj"
-
-"$(OUTDIR)\UPIPE_SAP_Test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "UPIPE_SAP_Test - Win32 Debug" || "$(CFG)" ==\
- "UPIPE_SAP_Test - Win32 Alpha Debug"
-SOURCE=.\UPIPE_SAP_Test.cpp
-
-!IF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Debug"
-
-DEP_CPP_UPIPE=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Addr.h"\
-	"..\ace\Addr.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\Hash_Map_Manager.cpp"\
-	"..\ace\Hash_Map_Manager.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\IO_Cntl_Msg.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\IPC_SAP.h"\
-	"..\ace\IPC_SAP.i"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Message_Block.h"\
-	"..\ace\Message_Block.i"\
-	"..\ace\Message_Queue.cpp"\
-	"..\ace\Message_Queue.h"\
-	"..\ace\Message_Queue.i"\
-	"..\ace\Module.cpp"\
-	"..\ace\Module.h"\
-	"..\ace\Module.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Service_Types.h"\
-	"..\ace\Service_Types.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SPIPE.h"\
-	"..\ace\SPIPE.i"\
-	"..\ace\SPIPE_Acceptor.h"\
-	"..\ace\SPIPE_Addr.h"\
-	"..\ace\SPIPE_Addr.i"\
-	"..\ace\SPIPE_Stream.h"\
-	"..\ace\SPIPE_Stream.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\Strategies.h"\
-	"..\ace\Strategies_T.cpp"\
-	"..\ace\Strategies_T.h"\
-	"..\ace\Stream.cpp"\
-	"..\ace\Stream.h"\
-	"..\ace\Stream.i"\
-	"..\ace\Stream_Modules.cpp"\
-	"..\ace\Stream_Modules.h"\
-	"..\ace\Stream_Modules.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Task.h"\
-	"..\ace\Task.i"\
-	"..\ace\Task_T.cpp"\
-	"..\ace\Task_T.h"\
-	"..\ace\Task_T.i"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Time_Value.h"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Trace.h"\
-	"..\ace\UPIPE_Acceptor.h"\
-	"..\ace\UPIPE_Acceptor.i"\
-	"..\ace\UPIPE_Addr.h"\
-	"..\ace\UPIPE_Connector.h"\
-	"..\ace\UPIPE_Connector.i"\
-	"..\ace\UPIPE_Stream.h"\
-	"..\ace\UPIPE_Stream.i"\
-	"..\ace\Version.h"\
-	"..\ace\WFMO_Reactor.h"\
-	"..\ace\WFMO_Reactor.i"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\UPIPE_SAP_Test.obj" : $(SOURCE) $(DEP_CPP_UPIPE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Debug"
-
-DEP_CPP_UPIPE=\
-	"..\ace\ACE.h"\
-	"..\ace\ACE.i"\
-	"..\ace\Addr.h"\
-	"..\ace\Addr.i"\
-	"..\ace\Atomic_Op.i"\
-	"..\ace\Auto_Ptr.cpp"\
-	"..\ace\Auto_Ptr.h"\
-	"..\ace\Auto_Ptr.i"\
-	"..\ace\Basic_Types.h"\
-	"..\ace\Basic_Types.i"\
-	"..\ace\config-win32-common.h"\
-	"..\ace\config-win32.h"\
-	"..\ace\config.h"\
-	"..\ace\Containers.cpp"\
-	"..\ace\Containers.h"\
-	"..\ace\Containers.i"\
-	"..\ace\Event_Handler.h"\
-	"..\ace\Event_Handler.i"\
-	"..\ace\Free_List.cpp"\
-	"..\ace\Free_List.h"\
-	"..\ace\Free_List.i"\
-	"..\ace\Handle_Set.h"\
-	"..\ace\Handle_Set.i"\
-	"..\ace\Hash_Map_Manager.cpp"\
-	"..\ace\Hash_Map_Manager.h"\
-	"..\ace\inc_user_config.h"\
-	"..\ace\IO_Cntl_Msg.h"\
-	"..\ace\iosfwd.h"\
-	"..\ace\IPC_SAP.h"\
-	"..\ace\IPC_SAP.i"\
-	"..\ace\Log_Msg.h"\
-	"..\ace\Log_Priority.h"\
-	"..\ace\Log_Record.h"\
-	"..\ace\Log_Record.i"\
-	"..\ace\Malloc.h"\
-	"..\ace\Malloc.i"\
-	"..\ace\Malloc_T.cpp"\
-	"..\ace\Malloc_T.h"\
-	"..\ace\Malloc_T.i"\
-	"..\ace\Managed_Object.cpp"\
-	"..\ace\Managed_Object.h"\
-	"..\ace\Managed_Object.i"\
-	"..\ace\Mem_Map.h"\
-	"..\ace\Mem_Map.i"\
-	"..\ace\Memory_Pool.h"\
-	"..\ace\Memory_Pool.i"\
-	"..\ace\Message_Block.h"\
-	"..\ace\Message_Block.i"\
-	"..\ace\Message_Queue.cpp"\
-	"..\ace\Message_Queue.h"\
-	"..\ace\Message_Queue.i"\
-	"..\ace\Module.cpp"\
-	"..\ace\Module.h"\
-	"..\ace\Module.i"\
-	"..\ace\Object_Manager.h"\
-	"..\ace\Object_Manager.i"\
-	"..\ace\OS.h"\
-	"..\ace\OS.i"\
-	"..\ace\Reactor.h"\
-	"..\ace\Reactor.i"\
-	"..\ace\Reactor_Impl.h"\
-	"..\ace\Service_Config.h"\
-	"..\ace\Service_Config.i"\
-	"..\ace\Service_Object.h"\
-	"..\ace\Service_Object.i"\
-	"..\ace\Service_Types.h"\
-	"..\ace\Service_Types.i"\
-	"..\ace\Shared_Object.h"\
-	"..\ace\Shared_Object.i"\
-	"..\ace\Signal.h"\
-	"..\ace\Signal.i"\
-	"..\ace\SPIPE.h"\
-	"..\ace\SPIPE.i"\
-	"..\ace\SPIPE_Acceptor.h"\
-	"..\ace\SPIPE_Addr.h"\
-	"..\ace\SPIPE_Addr.i"\
-	"..\ace\SPIPE_Stream.h"\
-	"..\ace\SPIPE_Stream.i"\
-	"..\ace\SString.h"\
-	"..\ace\SString.i"\
-	"..\ace\Strategies.h"\
-	"..\ace\Strategies_T.cpp"\
-	"..\ace\Strategies_T.h"\
-	"..\ace\Stream.cpp"\
-	"..\ace\Stream.h"\
-	"..\ace\Stream.i"\
-	"..\ace\Stream_Modules.cpp"\
-	"..\ace\Stream_Modules.h"\
-	"..\ace\Stream_Modules.i"\
-	"..\ace\streams.h"\
-	"..\ace\SV_Semaphore_Complex.h"\
-	"..\ace\SV_Semaphore_Complex.i"\
-	"..\ace\SV_Semaphore_Simple.h"\
-	"..\ace\SV_Semaphore_Simple.i"\
-	"..\ace\Svc_Conf_Tokens.h"\
-	"..\ace\Synch.h"\
-	"..\ace\Synch.i"\
-	"..\ace\Synch_Options.h"\
-	"..\ace\Synch_T.cpp"\
-	"..\ace\Synch_T.h"\
-	"..\ace\Synch_T.i"\
-	"..\ace\sys_conf.h"\
-	"..\ace\Task.h"\
-	"..\ace\Task.i"\
-	"..\ace\Task_T.cpp"\
-	"..\ace\Task_T.h"\
-	"..\ace\Task_T.i"\
-	"..\ace\Thread.h"\
-	"..\ace\Thread.i"\
-	"..\ace\Thread_Manager.h"\
-	"..\ace\Thread_Manager.i"\
-	"..\ace\Time_Value.h"\
-	"..\ace\Timer_Queue.h"\
-	"..\ace\Timer_Queue_T.cpp"\
-	"..\ace\Timer_Queue_T.h"\
-	"..\ace\Timer_Queue_T.i"\
-	"..\ace\Trace.h"\
-	"..\ace\UPIPE_Acceptor.h"\
-	"..\ace\UPIPE_Acceptor.i"\
-	"..\ace\UPIPE_Addr.h"\
-	"..\ace\UPIPE_Connector.h"\
-	"..\ace\UPIPE_Connector.i"\
-	"..\ace\UPIPE_Stream.h"\
-	"..\ace\UPIPE_Stream.i"\
-	"..\ace\Version.h"\
-	"..\ace\WFMO_Reactor.h"\
-	"..\ace\WFMO_Reactor.i"\
-	"..\ace\ws2tcpip.h"\
-	".\test_config.h"\
-	{$(INCLUDE)}"sys\stat.h"\
-	{$(INCLUDE)}"sys\types.h"\
-	
-
-"$(INTDIR)\UPIPE_SAP_Test.obj" : $(SOURCE) $(DEP_CPP_UPIPE) "$(INTDIR)"
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/tests/VCAUTO.MAK b/tests/VCAUTO.MAK
deleted file mode 100644
index 8f7cfc7592d..00000000000
--- a/tests/VCAUTO.MAK
+++ /dev/null
@@ -1,57 +0,0 @@
-# Directory: tests/
-#  $Id$
-
-MAK_LIST = Atomic_Op_Test \
-        Barrier_Test \
-        Basic_Types_Test \
-        Buffer_Stream_Test \
-        Conn_Test \
-        Enum_Interfaces_Test \
-        Env_Value_Test \
-        Future_Test \
-        Handle_Set_Test \
-        Hash_Map_Manager_Test \
-        IOStream_Test \
-        Map_Manager_Test \
-        Mem_Map_Test \
-        Message_Block_Test \
-        Message_Queue_Notifications_Test \
-        Message_Queue_Test \
-        MM_Shared_Memory_Test \
-        MT_SOCK_Test \
-        Naming_Test \
-        Notify_Performance_Test \
-        Pipe_Test \
-        Priority_Buffer_Test \
-        Priority_Reactor_Test \
-        Priority_Task_Test \
-        Process_Mutex_Test \
-        Process_Strategy_Test \
-        Reactors_Test \
-        Reactor_Exceptions_Test \
-        Reactor_Notify_Test \
-        Reactor_Performance_Test \
-        Reactor_Timer_Test \
-        Reader_Writer_Test \
-        Recursive_Mutex_Test \
-        Semaphore_Test \
-        Service_Config_Test \
-        Sigset_Ops_Test \
-        Simple_Message_Block_Test \
-        SOCK_Connector_Test \
-        SOCK_Test \
-        SPIPE_Test \
-        SString_Test \
-        SV_Shared_Memory_Test \
-        Task_Test \
-        Thread_Manager_Test \
-        Thread_Mutex_Test \
-        Thread_Pool_Test \
-        Timer_Queue_Test \
-        Time_Service_Test \
-        Time_Value_Test \
-        Tokens_Test \
-	TSS_Test \
-	UPIPE_SAP_Test
-
-!INCLUDE <$(ACE_ROOT)\include\makeinclude\VC50_DIR.MAK>