ChangeLogTag: Mon May 19 11:11:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 157 insertions, 147 deletions

diff --git a/tests/Makefile.bor b/tests/Makefile.bor
index 452a7ce7aac..7570e933b9c 100644
--- a/tests/Makefile.bor
+++ b/tests/Makefile.bor
@@ -3,149 +3,8 @@
 # Makefile for building the ACE tests
 #
 
-NAMES = \
-        ACE_Test \
-	Aio_Platform_Test \
-        Arg_Shifter_Test \
-	ARGV_Test \
-	Atomic_Op_Test \
-	Auto_IncDec_Test \
-	Barrier_Test \
-	Basic_Types_Test \
-        Bound_Ptr_Test \
-	Buffer_Stream_Test \
-	Cache_Map_Manager_Test \
-	Cached_Accept_Conn_Test \
-        Cached_Allocator_Test \
-	Cached_Conn_Test \
-	Capabilities_Test \
-	CDR_Array_Test \
-	CDR_File_Test \
-	CDR_Test \
-	Codecs_Test \
-	Collection_Test \
-	Conn_Test \
-	Config_Test \
-        Date_Time_Test \
-	Dirent_Test \
-	DLL_Test \
-	DLList_Test \
-	Dynamic_Priority_Test \
-	Enum_Interfaces_Test \
-	Env_Value_Test \
-	FlReactor_Test \
-        Framework_Component_Test \
-	Future_Set_Test \
-	Future_Test \
-        Get_Opt_Test \
-	Handle_Set_Test \
-	Hash_Map_Bucket_Iterator_Test \
-	Hash_Map_Manager_Test \
-	High_Res_Timer_Test \
-        INET_Addr_Test \
-	IOStream_Test \
-	Lazy_Map_Manager_Test \
-	Log_Msg_Test \
-	Logging_Strategy_Test \
-	Malloc_Test \
-	Map_Manager_Test \
-	Map_Test \
-        Max_Default_Port_Test \
-        MEM_Stream_Test \
-	Mem_Map_Test \
-	Message_Block_Test \
-	Message_Queue_Notifications_Test \
-	Message_Queue_Test \
-	Message_Queue_Test_Ex \
-	MM_Shared_Memory_Test \
-	MT_Reactor_Timer_Test \
-	MT_Reactor_Upcall_Test \
-	MT_SOCK_Test \
-        Multicast_Test \
-        Multihomed_INET_Addr_Test \
-	Naming_Test \
-	New_Fail_Test \
-	Notify_Performance_Test \
-	Object_Manager_Test \
-	Obstack_Test \
-	OrdMultiSet_Test \
-	OS_Test \
-	Pipe_Test \
-	Proactor_Scatter_Gather_Test \
-	Proactor_Test \
-	Proactor_Timer_Test \
-	Priority_Buffer_Test \
-	Priority_Reactor_Test \
-	Priority_Task_Test \
-	Process_Manager_Test \
-	Process_Mutex_Test \
-	Process_Strategy_Test \
-	RB_Tree_Test \
-	Reactor_Exceptions_Test \
-	Reactor_Notify_Test \
-	Reactor_Dispatch_Order_Test \
-	Reactor_Performance_Test \
-	Reactor_Timer_Test \
-	Reactors_Test \
-	Reader_Writer_Test \
-	Recursive_Condition_Test \
-	Recursive_Condition_Bug_Test \
-	Recursive_Mutex_Test \
-        Refcounted_Auto_Ptr_Test \
-        Reverse_Lock_Test \
-	Semaphore_Test \
-	Service_Config_Test \
-	Signal_Test \
-	Sigset_Ops_Test \
-	Simple_Message_Block_Test \
-	SOCK_Connector_Test \
-	SOCK_Send_Recv_Test \
-	SOCK_Test \
-	SPIPE_Test \
-	SString_Test \
-	SV_Shared_Memory_Test \
-	Svc_Handler_Test \
-	Task_Test \
-	Thread_Manager_Test \
-	Thread_Mutex_Test \
-	Thread_Pool_Reactor_Test \
-	Thread_Pool_Reactor_Resume_Test \
-	Thread_Pool_Test \
-	Time_Service_Test \
-	Time_Value_Test \
-	Timeprobe_Test \
-	Timer_Queue_Test \
-	TkReactor_Test \
-	Tokens_Test \
-        Token_Strategy_Test \
-	TP_Reactor_Test \
-	TSS_Test \
-        Vector_Test \
-        Unbounded_Set_Test_Ex \
-	Upgradable_RW_Test \
-	UPIPE_SAP_Test \
-	XtReactor_Test
-
-!ifdef SSL_ROOT
-DIRS =  RMCast \
-	SSL
-!else
-DIRS =  RMCast
-!endif
-
 MAKEFILES = \
 	Test_Output.bor \
-	DLL_Test.bor \
-	Service_Config_DLL.bor \
-	Framework_Component_DLL.bor
-
-OBJFILES = $(OBJDIR)\$(NAME).obj $(OBJDIR)\Main.obj
-
-CFLAGS = $(ACE_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = $(ACE_LIB) $(BINDIR)\Test_Output$(LIB_DECORATOR).lib
+   Tests.bor
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/tests/RMCast/Makefile.bor b/tests/RMCast/Makefile.bor
index 88fa9503c0e..890febc1192 100644
--- a/tests/RMCast/Makefile.bor
+++ b/tests/RMCast/Makefile.bor
@@ -28,7 +28,7 @@ CPPDIR = .;..
 LIBFILES = \
 	$(ACE_LIB) \
 	$(ACE_RMCAST_LIB) \
-        $(BINDIR)\Test_Output$(LIB_DECORATOR).lib
+   $(CORE_BINDIR)\Test_Output$(LIB_DECORATOR).lib
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/tests/SSL/Makefile.bor b/tests/SSL/Makefile.bor
index d7b161865c9..ff8e5be09d6 100644
--- a/tests/SSL/Makefile.bor
+++ b/tests/SSL/Makefile.bor
@@ -19,7 +19,7 @@ LIBFILES = \
         $(ACE_LIB) \
         $(ACE_SSL_LIB) \
         $(SSL_LIB) \
-        $(BINDIR)\Test_Output$(LIB_DECORATOR).lib
+        $(CORE_BINDIR)\Test_Output$(LIB_DECORATOR).lib
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/tests/Test_Output.bor b/tests/Test_Output.bor
index d4574c83166..b4c7bce860f 100644
--- a/tests/Test_Output.bor
+++ b/tests/Test_Output.bor
@@ -4,8 +4,6 @@
 
 NAME = Test_Output
 
-TARGET = $(BINDIR)\$(NAME).dll
-
 OBJFILES = $(OBJDIR)\Test_Output.obj
 
 CFLAGS = $(ACE_CFLAGS) -DTEST_OUTPUT_BUILD_DLL
@@ -14,4 +12,5 @@ CPPDIR = .
 
 LIBFILES = $(ACE_LIB)
 
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/tests/Tests.bor b/tests/Tests.bor
new file mode 100644
index 00000000000..48dcca6e302
--- /dev/null
+++ b/tests/Tests.bor
@@ -0,0 +1,152 @@
+#
+# $Id$
+# Makefile for building the ACE tests
+#
+
+NAMES = \
+   ACE_Test \
+	Aio_Platform_Test \
+   Arg_Shifter_Test \
+	ARGV_Test \
+	Atomic_Op_Test \
+	Auto_IncDec_Test \
+	Barrier_Test \
+	Basic_Types_Test \
+   Bound_Ptr_Test \
+	Buffer_Stream_Test \
+	Cache_Map_Manager_Test \
+	Cached_Accept_Conn_Test \
+   Cached_Allocator_Test \
+	Cached_Conn_Test \
+	Capabilities_Test \
+	CDR_Array_Test \
+	CDR_File_Test \
+	CDR_Test \
+	Codecs_Test \
+	Collection_Test \
+	Conn_Test \
+	Config_Test \
+   Date_Time_Test \
+	Dirent_Test \
+	DLL_Test \
+	DLList_Test \
+	Dynamic_Priority_Test \
+	Enum_Interfaces_Test \
+	Env_Value_Test \
+	FlReactor_Test \
+   Framework_Component_Test \
+	Future_Set_Test \
+	Future_Test \
+        Get_Opt_Test \
+	Handle_Set_Test \
+	Hash_Map_Bucket_Iterator_Test \
+	Hash_Map_Manager_Test \
+	High_Res_Timer_Test \
+        INET_Addr_Test \
+	IOStream_Test \
+	Lazy_Map_Manager_Test \
+	Log_Msg_Test \
+	Logging_Strategy_Test \
+	Malloc_Test \
+	Map_Manager_Test \
+	Map_Test \
+        Max_Default_Port_Test \
+        MEM_Stream_Test \
+	Mem_Map_Test \
+	Message_Block_Test \
+	Message_Queue_Notifications_Test \
+	Message_Queue_Test \
+	Message_Queue_Test_Ex \
+	MM_Shared_Memory_Test \
+	MT_Reactor_Timer_Test \
+	MT_Reactor_Upcall_Test \
+	MT_SOCK_Test \
+        Multicast_Test \
+        Multihomed_INET_Addr_Test \
+	Naming_Test \
+	New_Fail_Test \
+	Notify_Performance_Test \
+	Object_Manager_Test \
+	Obstack_Test \
+	OrdMultiSet_Test \
+	OS_Test \
+	Pipe_Test \
+	Proactor_Scatter_Gather_Test \
+	Proactor_Test \
+	Proactor_Timer_Test \
+	Priority_Buffer_Test \
+	Priority_Reactor_Test \
+	Priority_Task_Test \
+	Process_Manager_Test \
+	Process_Mutex_Test \
+	Process_Strategy_Test \
+	RB_Tree_Test \
+	Reactor_Exceptions_Test \
+	Reactor_Notify_Test \
+	Reactor_Dispatch_Order_Test \
+	Reactor_Performance_Test \
+	Reactor_Timer_Test \
+	Reactors_Test \
+	Reader_Writer_Test \
+	Recursive_Condition_Test \
+	Recursive_Condition_Bug_Test \
+	Recursive_Mutex_Test \
+        Refcounted_Auto_Ptr_Test \
+        Reverse_Lock_Test \
+	Semaphore_Test \
+	Service_Config_Test \
+	Signal_Test \
+	Sigset_Ops_Test \
+	Simple_Message_Block_Test \
+	SOCK_Connector_Test \
+	SOCK_Send_Recv_Test \
+	SOCK_Test \
+	SPIPE_Test \
+	SString_Test \
+	SV_Shared_Memory_Test \
+	Svc_Handler_Test \
+	Task_Test \
+	Thread_Manager_Test \
+	Thread_Mutex_Test \
+	Thread_Pool_Reactor_Test \
+	Thread_Pool_Reactor_Resume_Test \
+	Thread_Pool_Test \
+	Time_Service_Test \
+	Time_Value_Test \
+	Timeprobe_Test \
+	Timer_Queue_Test \
+	TkReactor_Test \
+	Tokens_Test \
+        Token_Strategy_Test \
+	TP_Reactor_Test \
+	TSS_Test \
+        Vector_Test \
+        Unbounded_Set_Test_Ex \
+	Upgradable_RW_Test \
+	UPIPE_SAP_Test \
+	XtReactor_Test
+
+!ifdef SSL_ROOT
+DIRS =  RMCast \
+        SSL
+!else
+DIRS =  RMCast
+!endif
+
+MAKEFILES = \
+	DLL_Test.bor \
+	Service_Config_DLL.bor \
+	Framework_Component_DLL.bor
+
+OBJFILES = $(OBJDIR)\$(NAME).obj $(OBJDIR)\Main.obj
+
+CFLAGS = $(ACE_CFLAGS)
+
+CPPDIR = .
+
+MAKEFILE = Tests.bor
+
+LIBFILES = $(ACE_LIB) $(CORE_BINDIR)\Test_Output$(LIB_DECORATOR).lib
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>