ChangeLogTag:Thu Apr 17 16:15:24 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

2 files changed, 205 insertions, 42 deletions

diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp
index 4fd07c47c83..8de80cbec88 100644
--- a/tests/Dirent_Test.cpp
+++ b/tests/Dirent_Test.cpp
@@ -29,14 +29,16 @@
 #include "ace/Dirent.h"
 #include "ace/Dirent_Selector.h"
 
-ACE_RCSID(tests, Dirent_Test, "$Id$")
+ACE_RCSID (tests,
+           Dirent_Test,
+           "$Id$")
 
 #if defined (VXWORKS) || defined(CHORUS)
 #define TEST_DIR "."
 #define TEST_ENTRY ".."
 #else
 #define TEST_DIR "../tests"
-#define TEST_ENTRY "Dirent_Test.cpp"
+#define TEST_ENTRY "Makefile"
 #endif /* VXWORKS || CHORUS */
 
 // Number of entries in the directory.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 580de1ef9de..3db01970f5e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,10 +8,6 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
 ## We can't add "CLASSIX" to the SUBDIRS list as this point since "CLASSIX"
 ## would be built before the "test" directory.  How do we get around this
 ## without moving directories around?
@@ -32,11 +28,29 @@ LDADD = $(top_builddir)/ace/libACE.la
 ##LIBS = $(top_builddir)/ace/libACE.la
 
 noinst_SCRIPTS = \
-  run_tests.sh \
-  run_tests.psosim \
+  run_tests.bat \
   run_tests.check \
-  run_tests.vxworks \
-  run_tests.bat
+  run_test.pl \
+  run_tests.psosim \
+  run_tests_remote.sh
+
+
+## @todo Do not build/run this test if running on LynxOS < 3.1.0.
+CDR_ARRAY_TEST = CDR_Array_Test
+
+## @todo Do not build these tests if their corresponding components in
+##       ACE have not been enabled/built.
+##if BUILD_CODECS_FILES
+CODECS_TEST = Codecs_Test
+##else
+##CODECS_TEST =
+##endif
+
+##if BUILD_TOKEN_FILES
+TOKENS_TEST = Tokens_Test
+##else
+##TOKENS_TEST =
+##endif
 
 if COMPILE_XTREACTOR_TEST
 XTREACTOR_TEST = XtReactor_Test
@@ -44,82 +58,123 @@ else
 XTREACTOR_TEST =
 endif
 
+## @todo Make the DLL_Test, Service_Config_Test and
+##       Framework_Component tests conditional on shared library
+##       builds.  Do not build in static library only builds.
+FRAMEWORK_COMPONENT_TEST = Framework_Component_Test
+## FRAMEWORK_COMPONENT_TEST =
+
 ## Build the shared libraries needed for the DLL_Test and the
 ## Service_Config_DLL test. 
-noinst_LTLIBRARIES = libDLL_Test.la libService_Config_DLL.la
+libdir = $(shell pwd)
+lib_LTLIBRARIES = libDLL_Test.la libService_Config_DLL.la
 
-libDLL_Test_la_LDFLAGS = -module
 libDLL_Test_la_SOURCES = DLL_Test_Impl.cpp DLL_Test_Impl.h
+libDLL_Test_la_LDFLAGS = -module
 
-libService_Config_DLL_la_LDFLAGS = -module
 libService_Config_DLL_la_SOURCES = Service_Config_DLL.cpp Service_Config_DLL.h
+libService_Config_DLL_la_LDFLAGS = -module
+libService_Config_DLL_la_LIBADD = $(top_builddir)/ace/libACE.la
 
 ## Build the following test programs when a `make check' is
 ## issued by the user.
-check_PROGRAMS = \
+##check_PROGRAMS =
+noinst_PROGRAMS = \
   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 \
+  CDR_File_Test \
+  CDR_Test \
   Cache_Map_Manager_Test \
+  Cached_Accept_Conn_Test \
+  Cached_Allocator_Test \
   Cached_Conn_Test \
   Capabilities_Test \
-  CDR_Test \
-  CDR_File_Test \
-  CDR_Array_Test \
   Collection_Test \
+  Config_Test \
   Conn_Test \
-  DLL_Test \
+  DLL_Test\
   DLList_Test \
+  Date_Time_Test \
+  Dev_Poll_Reactor_Test \
+  Dirent_Test \
   Dynamic_Priority_Test \
   Enum_Interfaces_Test \
   Env_Value_Test \
+  FIFO_Test \
   Future_Test \
+  Future_Set_Test \
+  Get_Opt_Test \
   Handle_Set_Test \
+  Hash_Map_Manager_Test \
+  Hash_Map_Bucket_Iterator_Test \
   High_Res_Timer_Test \
+  INET_Addr_Test \
   IOStream_Test \
+  Lazy_Map_Manager_Test \
+  Log_Msg_Test \
+  Logging_Strategy_Test \
+  MEM_Stream_Test \
   MM_Shared_Memory_Test \
   MT_Reactor_Timer_Test \
   MT_Reactor_Upcall_Test \
   MT_SOCK_Test \
+  Malloc_Test \
   Map_Manager_Test \
   Map_Test \
-  MEM_Stream_Test \
+  Max_Default_Port_Test \
   Mem_Map_Test \
   Message_Block_Test \
   Message_Queue_Notifications_Test \
   Message_Queue_Test \
-  New_Fail_Test \
+  Message_Queue_Test_Ex \
+  Multicast_Test \
   Notify_Performance_Test \
+  OS_Test \
+  Object_Manager_Test \
+  Obstack_Test \
   OrdMultiSet_Test \
   Pipe_Test \
   Priority_Buffer_Test \
   Priority_Reactor_Test \
   Priority_Task_Test \
-  Process_Manager_Test \
+  Proactor_Scatter_Gather_Test \
+  Proactor_Test \
+  Proactor_Timer_Test \
   Process_Mutex_Test \
   Process_Strategy_Test \
+  Process_Manager_Test \
   RB_Tree_Test \
+  Reactor_Dispatch_Order_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_Mutex_Test \
+  Refcounted_Auto_Ptr_Test \
   Reverse_Lock_Test \
   SOCK_Connector_Test \
+  SOCK_Send_Recv_Test \
   SOCK_Test \
   SPIPE_Test \
   SString_Test \
   SV_Shared_Memory_Test \
   Semaphore_Test \
   Service_Config_Test \
+  Signal_Test \
   Sigset_Ops_Test \
   Simple_Message_Block_Test \
+  Svc_Handler_Test \
+  TP_Reactor_Test \
   TSS_Test \
   Task_Test \
   Thread_Manager_Test \
@@ -129,18 +184,30 @@ check_PROGRAMS = \
   Time_Value_Test \
   Timeprobe_Test \
   Timer_Queue_Test \
+  Token_Strategy_Test \
   UPIPE_SAP_Test \
   Unbounded_Set_Test_Ex \
   Upgradable_RW_Test \
+  Vector_Test \
   \
   Naming_Test \
   \
   FlReactor_Test \
   Thread_Pool_Reactor_Test \
-  TkReactor_Test $(XTREACTOR_TEST)
+  Thread_Pool_Reactor_Resume_Test \
+  TkReactor_Test \
+  $(CDR_ARRAY_TEST) \
+  $(CODECS_TEST) \
+  $(FRAMEWORK_COMPONENT_TEST) \
+  $(TOKENS_TEST) \
+  $(XTREACTOR_TEST)
 
 Aio_Platform_Test_SOURCES = Aio_Platform_Test.cpp
 
+Arg_Shifter_Test_SOURCES = Arg_Shifter_Test.cpp
+
+ARGV_Test_SOURCES = ARGV_Test.cpp
+
 Atomic_Op_Test_SOURCES = Atomic_Op_Test.cpp
 
 Auto_IncDec_Test_SOURCES = Auto_IncDec_Test.cpp
@@ -149,31 +216,47 @@ Barrier_Test_SOURCES = Barrier_Test.cpp
 
 Basic_Types_Test_SOURCES = Basic_Types_Test.cpp
 
+Bound_Ptr_Test_SOURCES = Bound_Ptr_Test.cpp
+
 Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
 
+CDR_Array_Test_SOURCES = CDR_Array_Test.cpp
+
 CDR_Test_SOURCES = CDR_Test.cpp
 
 CDR_File_Test_SOURCES = CDR_File_Test.cpp
 
-CDR_Array_Test_SOURCES = CDR_Array_Test.cpp
+Cached_Accept_Conn_Test_SOURCES = Cached_Accept_Conn_Test.cpp \
+                                  Cached_Accept_Conn_Test.h
 
-# Cached_Accept_Conn_Test_SOURCES = Cached_Accept_Conn_Test.cpp
+Cached_Allocator_Test_SOURCES = Cached_Allocator_Test.cpp
 
-Cached_Conn_Test_SOURCES = Cached_Conn_Test.cpp
+Cached_Conn_Test_SOURCES = Cached_Conn_Test.cpp \
+                           Cached_Conn_Test.h
 
 Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp \
                                  Cache_Map_Manager_Test.h
 
 Capabilities_Test_SOURCES = Capabilities_Test.cpp
 
-Collection_Test_SOURCES = Collection_Test.cpp
+Codecs_Test_SOURCES = Codecs_Test.cpp
+
+Collection_Test_SOURCES = Collection_Test.cpp Collection_Test.h
+
+Config_Test_SOURCES = Config_Test.cpp Config_Test.h
 
 Conn_Test_SOURCES = Conn_Test.cpp Conn_Test.h
 
+DLList_Test_SOURCES = DLList_Test.cpp
+
 DLL_Test_SOURCES = DLL_Test.cpp DLL_Test.h
 DLL_Test_DEPENDENCIES = libDLL_Test.la
 
-DLList_Test_SOURCES = DLList_Test.cpp
+Date_Time_Test_SOURCES = Date_Time_Test.cpp
+
+Dev_Poll_Reactor_Test_SOURCES = Dev_Poll_Reactor_Test.cpp
+
+Dirent_Test_SOURCES = Dirent_Test.cpp
 
 Dynamic_Priority_Test_SOURCES = Dynamic_Priority_Test.cpp
 
@@ -181,16 +264,39 @@ Enum_Interfaces_Test_SOURCES = Enum_Interfaces_Test.cpp
 
 Env_Value_Test_SOURCES = Env_Value_Test.cpp
 
+FIFO_Test_SOURCES = FIFO_Test.cpp
+
 FlReactor_Test_SOURCES = FlReactor_Test.cpp
 
+Framework_Component_Test_SOURCES = Framework_Component_Test.cpp \
+                                   Framework_Component_Test.h
+
 Future_Test_SOURCES = Future_Test.cpp
 
+Future_Set_Test_SOURCES = Future_Set_Test.cpp
+
+Get_Opt_Test_SOURCES = Get_Opt_Test.cpp
+
 Handle_Set_Test_SOURCES = Handle_Set_Test.cpp
 
+Hash_Map_Manager_Test_SOURCES = Hash_Map_Manager_Test.cpp
+
+Hash_Map_Bucket_Iterator_Test_SOURCES = Hash_Map_Bucket_Iterator_Test.cpp
+
 High_Res_Timer_Test_SOURCES = High_Res_Timer_Test.cpp
 
+INET_Addr_Test_SOURCES = INET_Addr_Test.cpp
+
 IOStream_Test_SOURCES = IOStream_Test.cpp
 
+Lazy_Map_Manager_Test_SOURCES = Lazy_Map_Manager_Test.cpp
+
+Log_Msg_Test_SOURCES = Log_Msg_Test.cpp
+
+Logging_Strategy_Test_SOURCES = Logging_Strategy_Test.cpp
+
+MEM_Stream_Test_SOURCES = MEM_Stream_Test.cpp MEM_Stream_Test.h
+
 MM_Shared_Memory_Test_SOURCES = MM_Shared_Memory_Test.cpp
 
 MT_Reactor_Timer_Test_SOURCES = MT_Reactor_Timer_Test.cpp \
@@ -200,10 +306,15 @@ MT_Reactor_Upcall_Test_SOURCES = MT_Reactor_Upcall_Test.cpp
 
 MT_SOCK_Test_SOURCES = MT_SOCK_Test.cpp
 
+Malloc_Test_SOURCES = Malloc_Test.cpp Malloc_Test.h
+
 Map_Manager_Test_SOURCES = Map_Manager_Test.cpp
 
 Map_Test_SOURCES = Map_Test.cpp Map_Test.h
 
+Max_Default_Port_Test_SOURCES = Max_Default_Port_Test.cpp \
+                                Max_Default_Port_Test.h
+
 Mem_Map_Test_SOURCES = Mem_Map_Test.cpp
 
 Message_Block_Test_SOURCES = Message_Block_Test.cpp
@@ -212,12 +323,21 @@ Message_Queue_Notifications_Test_SOURCES = Message_Queue_Notifications_Test.cpp
 
 Message_Queue_Test_SOURCES = Message_Queue_Test.cpp
 
-Naming_Test_SOURCES = Naming_Test.cpp
+Message_Queue_Test_Ex_SOURCES = Message_Queue_Test_Ex.cpp \
+                                Message_Queue_Test_Ex.h
 
-New_Fail_Test_SOURCES = New_Fail_Test.cpp
+Multicast_Test_SOURCES = Multicast_Test.cpp
+
+Naming_Test_SOURCES = Naming_Test.cpp
 
 Notify_Performance_Test_SOURCES = Notify_Performance_Test.cpp
 
+OS_Test_SOURCES = OS_Test.cpp
+
+Object_Manager_Test_SOURCES = Object_Manager_Test.cpp
+
+Obstack_Test_SOURCES = Obstack_Test.cpp
+
 OrdMultiSet_Test_SOURCES = OrdMultiSet_Test.cpp
 
 Pipe_Test_SOURCES = Pipe_Test.cpp
@@ -229,6 +349,12 @@ Priority_Reactor_Test_SOURCES = Priority_Reactor_Test.cpp \
 
 Priority_Task_Test_SOURCES = Priority_Task_Test.cpp
 
+Proactor_Scatter_Gather_Test_SOURCES = Proactor_Scatter_Gather_Test.cpp
+
+Proactor_Test_SOURCES = Proactor_Test.cpp
+
+Proactor_Timer_Test_SOURCES = Proactor_Timer_Test.cpp
+
 Process_Manager_Test_SOURCES = Process_Manager_Test.cpp
 
 Process_Mutex_Test_SOURCES = Process_Mutex_Test.cpp
@@ -238,12 +364,12 @@ Process_Strategy_Test_SOURCES = Process_Strategy_Test.cpp \
 
 RB_Tree_Test_SOURCES = RB_Tree_Test.cpp RB_Tree_Test.h
 
+Reactor_Dispatch_Order_Test_SOURCES = Reactor_Dispatch_Order_Test.cpp
+
 Reactor_Exceptions_Test_SOURCES = Reactor_Exceptions_Test.cpp
 
 Reactor_Notify_Test_SOURCES = Reactor_Notify_Test.cpp
 
-Reactor_Dispatch_Order_Test_SOURCES = Reactor_Dispatch_Order_Test.cpp
-
 Reactor_Performance_Test_SOURCES = Reactor_Performance_Test.cpp \
                                    Reactor_Performance_Test.h
 
@@ -253,12 +379,19 @@ Reactors_Test_SOURCES = Reactors_Test.cpp
 
 Reader_Writer_Test_SOURCES = Reader_Writer_Test.cpp
 
+Recursive_Condition_Test_SOURCES = Recursive_Condition_Test.cpp
+
 Recursive_Mutex_Test_SOURCES = Recursive_Mutex_Test.cpp
 
+Refcounted_Auto_Ptr_Test_SOURCES = Refcounted_Auto_Ptr_Test.cpp \
+                                   Refcounted_Auto_Ptr_Test.h
+
 Reverse_Lock_Test_SOURCES = Reverse_Lock_Test.cpp
 
 SOCK_Connector_Test_SOURCES = SOCK_Connector_Test.cpp
 
+SOCK_Send_Recv_Test_SOURCES = SOCK_Send_Recv_Test.cpp
+
 SOCK_Test_SOURCES = SOCK_Test.cpp
 
 SPIPE_Test_SOURCES = SPIPE_Test.cpp
@@ -272,10 +405,16 @@ Semaphore_Test_SOURCES = Semaphore_Test.cpp
 Service_Config_Test_SOURCES = Service_Config_Test.cpp
 Service_Config_Test_DEPENDENCIES = libService_Config_DLL.la
 
+Signal_Test_SOURCES = Signal_Test.cpp
+
 Sigset_Ops_Test_SOURCES = Sigset_Ops_Test.cpp
 
 Simple_Message_Block_Test_SOURCES = Simple_Message_Block_Test.cpp
 
+Svc_Handler_Test_SOURCES = Svc_Handler_Test.cpp
+
+TP_Reactor_Test_SOURCES = TP_Reactor_Test.cpp TP_Reactor_Test.h
+
 TSS_Test_SOURCES = TSS_Test.cpp \
                    TSS_Test_Errno.h
 
@@ -285,8 +424,9 @@ Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp
 
 Thread_Mutex_Test_SOURCES = Thread_Mutex_Test.cpp
 
-Thread_Pool_Reactor_Test_SOURCES = Thread_Pool_Reactor_Test.cpp \
-                                   Thread_Pool_Reactor_Test.h
+Thread_Pool_Reactor_Test_SOURCES = Thread_Pool_Reactor_Test.cpp
+
+Thread_Pool_Reactor_Resume_Test_SOURCES = Thread_Pool_Reactor_Resume_Test.cpp
 
 Thread_Pool_Test_SOURCES = Thread_Pool_Test.cpp
 
@@ -300,6 +440,10 @@ Timer_Queue_Test_SOURCES = Timer_Queue_Test.cpp
 
 TkReactor_Test_SOURCES = TkReactor_Test.cpp
 
+Token_Strategy_Test_SOURCES = Token_Strategy_Test.cpp
+
+Tokens_Test_SOURCES = Tokens_Test.cpp
+
 UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
 
 Upgradable_RW_Test_SOURCES = Upgradable_RW_Test.cpp \
@@ -307,6 +451,8 @@ Upgradable_RW_Test_SOURCES = Upgradable_RW_Test.cpp \
 
 Unbounded_Set_Test_Ex_SOURCES = Unbounded_Set_Test_Ex.cpp
 
+Vector_Test_SOURCES = Vector_Test.cpp
+
 XtReactor_Test_SOURCES = XtReactor_Test.cpp
 XtReactor_Test_LDADD = $(top_builddir)/ace/libACE.la @XTREACTOR_TEST_XLIBS@
 
@@ -315,8 +461,15 @@ noinst_HEADERS = test_config.h
 
 ## Architecture independent data files
 noinst_DATA = \
+  run_test.lst \
+  \
+  Config_Test.ini \
+  Config_Test_Import_1.ini \
+  \
   TkReactor_Test.tcl \
   \
+  Service_Config_Test.UTF-16.conf \
+  Service_Config_Test.conf \
   UNIXserver.conf \
   UNIXclerk.conf \
   UNIXtokens.conf \
@@ -330,7 +483,8 @@ noinst_DATA = \
 if ACE_CROSS_COMPILED
 TESTS =
 else
-TESTS = $(check_PROGRAMS)
+##TESTS = $(check_PROGRAMS)
+TESTS = $(noinst_PROGRAMS)
 endif
 
 ## Set up the test environment
@@ -344,18 +498,25 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_DATA)
 ##  $(tmp)/ace_test_file \
 ##  $(tmp)/Naming_Test*
 
-## Run local targets
-## all-local: log_dir
-
-## Create tests `log' directory
-## log_dir:
-## 	if test -d log; then : else mkdir log; fi
+## Automake recognized target.  Appends these rules to the "all"
+## target.
+all-local:
+	for p in $(noinst_SCRIPTS) $(noinst_DATA); do \
+	  test -f $$p \
+	  || $(LN_S) $(top_srcdir)/tests/$$p $$p; done
+	touch tests-link-stamp
 
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
 	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
 
-## Clean up `log' directory , etc.
+## Clean up files and directories created by this Makefile.
+##   @todo Remove "bin" from the below list of files to remove.  It
+##         exists simply to clean up existing workspaces that may
+##         still have that link.  Also remove the "-f" option once
+##         "bin" is removed since it won't be needed after doing so.
 distclean-local:
+	-test -f tests-link-stamp \
+	   && rm -f $(noinst_SCRIPTS) $(noinst_DATA) tests-link-stamp bin
 	-rm -rf log