ChangeLogTag:Mon Feb 10 14:42:59 2003 Ossama Othman <ossama@uci.edu>

5 files changed, 186 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index e3d3ad90519..33851b8d360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Feb 10 14:42:59 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac:
+
+	  Generate tests/Makefile.
+
+	  Updated and re-enabled XtReactor support.
+
+	* Makefile.am:
+
+	  Added ACE one-button test directory to the sub-directory list.
+
+	* tests/Makefile.am:
+
+	  Updated one-button test list.  It was missing some new tests.
+
 Wed Feb  5 13:50:09 2003  Ossama Othman  <ossama@uci.edu>
 
 	* configure.ac:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e3d3ad90519..33851b8d360 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Mon Feb 10 14:42:59 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac:
+
+	  Generate tests/Makefile.
+
+	  Updated and re-enabled XtReactor support.
+
+	* Makefile.am:
+
+	  Added ACE one-button test directory to the sub-directory list.
+
+	* tests/Makefile.am:
+
+	  Updated one-button test list.  It was missing some new tests.
+
 Wed Feb  5 13:50:09 2003  Ossama Othman  <ossama@uci.edu>
 
 	* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 45645943b5a..497e4812c70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,8 @@ man_MANS = ace-config.1
 ## The docs directory is currently handled by the "dist-hook" makefile target.
 SUBDIRS = \
   ace \
-  apps
-##  tests \
+  apps \
+  tests
 ##  netsvcs \
 ##  man
 
diff --git a/configure.ac b/configure.ac
index 24079223441..7e903b9279b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ dnl Set the test language as C++
 AC_LANG([C++])
 
 dnl If we are cross compiling disable certain things in the Makefiles.
-AM_CONDITIONAL(ACE_CROSS_COMPILED, test X$cross_compiling = Xyes)dnl
+AM_CONDITIONAL([ACE_CROSS_COMPILED], [test X$cross_compiling = Xyes])
 
 
 dnl This checks for a binary called gm4, gnum4 or m4, and assigns
@@ -258,6 +258,8 @@ dnl Additional X library checks
 dnl We only check for these libraries if the user has
 dnl enabled XtReactor support.
 
+xt_reactor_go=no
+
 if test "$ace_user_enable_xt_reactor" = yes; then
 XTREACTOR_TEST_XLIBS=""
 dnl Check for Motif if we have X
@@ -269,7 +271,6 @@ dnl so we define another library variable that contains additional
 dnl libraries for the XtReactor test since it needs either Motif or the
 dnl Athena widget set.
 
-  xt_reactor_go=no
   AC_CHECK_LIB([Xm],[XmCreateRowColumn],
     [
      AC_DEFINE([ACE_HAS_XT])
@@ -293,13 +294,13 @@ dnl Athena widget set.
 
   AC_SUBST([XTREACTOR_TEST_XLIBS])
 
-dnl  AM_CONDITIONAL([COMPILE_XTREACTOR_TEST],[test X$xt_reactor_go = Xyes])
-
 dnl Restore pre-test linker flags
   LDFLAGS="$T_LDFLAGS"
 
 fi dnl test "$ace_user_enable_xt_reactor"= yes
 
+  AM_CONDITIONAL([COMPILE_XTREACTOR_TEST],[test X$xt_reactor_go = Xyes])
+
 dnl End additional X library checks
 
 dnl Some platforms do not have a dynamic linking library, however the
@@ -6339,7 +6340,7 @@ dnl since gethrtime.cpp uses assembler code specific to that compiler.
   [
    AC_DEFINE([ACE_HAS_PENTIUM])
   ],)
-AM_CONDITIONAL(ACE_ON_PENTIUM, test X$ace_cv_feature_pentium = Xyes)
+AM_CONDITIONAL([ACE_ON_PENTIUM], [test X$ace_cv_feature_pentium = Xyes])
 
 
 dnl
@@ -6645,9 +6646,9 @@ main ()
           ])
       ], , [AC_DEFINE([ACE_LACKS_NULL_PTHREAD_STATUS])])
 
-    dnl Check if OS supports timed mutex acquisitions
+    dnl Check if OS supports mutex timeouts
     dnl (e.g. pthread_mutex_timedlock()).
-    ACE_CACHE_CHECK([for timed mutex acquisitions],
+    ACE_CACHE_CHECK([for mutex timeouts],
       [ace_cv_have_mutex_timeouts],[
          AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifndef _REENTRANT
@@ -7302,6 +7303,7 @@ AC_CONFIG_FILES([
   apps/Makefile
   apps/gperf/Makefile
   apps/gperf/src/Makefile
+  tests/Makefile
 ])
 
 AC_CONFIG_COMMANDS([default],[
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e6aa65cee7a..a557f213dbd 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,11 @@ 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
 
 if COMPILE_XTREACTOR_TEST
 XTREACTOR_TEST = XtReactor_Test
@@ -56,70 +52,103 @@ libService_Config_DLL_la_SOURCES = Service_Config_DLL.cpp Service_Config_DLL.h
 
 ## 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,17 +158,24 @@ check_PROGRAMS = \
   Time_Value_Test \
   Timeprobe_Test \
   Timer_Queue_Test \
+  Token_Strategy_Test \
   UPIPE_SAP_Test \
   Upgradable_RW_Test \
+  Vector_Test \
   \
   Naming_Test \
   \
   FlReactor_Test \
   Thread_Pool_Reactor_Test \
+  Thread_Pool_Reactor_Resume_Test \
   TkReactor_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
@@ -148,31 +184,43 @@ 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_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
+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
 
@@ -180,16 +228,36 @@ 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
 
 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 \
@@ -199,10 +267,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
@@ -211,12 +284,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
@@ -228,6 +310,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
@@ -237,12 +325,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
 
@@ -252,12 +340,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
@@ -271,10 +366,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
 
@@ -284,8 +385,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
 
@@ -297,6 +399,8 @@ Timeprobe_Test_SOURCES = Timeprobe_Test.cpp
 
 Timer_Queue_Test_SOURCES = Timer_Queue_Test.cpp
 
+Token_Strategy_Test_SOURCES = Token_Strategy_Test.cpp
+
 TkReactor_Test_SOURCES = TkReactor_Test.cpp
 
 UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
@@ -304,6 +408,8 @@ UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
 Upgradable_RW_Test_SOURCES = Upgradable_RW_Test.cpp \
                              Upgradable_RW_Test.h
 
+Vector_Test_SOURCES = Vector_Test.cpp
+
 XtReactor_Test_SOURCES = XtReactor_Test.cpp
 XtReactor_Test_LDADD = $(top_builddir)/ace/libACE.la @XTREACTOR_TEST_XLIBS@
 
@@ -312,8 +418,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 \
@@ -327,7 +440,8 @@ noinst_DATA = \
 if ACE_CROSS_COMPILED
 TESTS =
 else
-TESTS = $(check_PROGRAMS)
+##TESTS = $(check_PROGRAMS)
+TESTS = $(noinst_PROGRAMS)
 endif
 
 ## Set up the test environment