1 files changed, 83 insertions, 1 deletions

diff --git a/tests/tests.mpc b/tests/tests.mpc
index 8b4c35d7576..684141b2069 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -17,6 +17,12 @@ project(Test_Output) : acelib, script {
     run_test.pl
     run_test.lst
   }
+
+  verbatim(automake,local) {
+dist_check_SCRIPTS = run_test.pl run_test.lst
+TESTS = $(noinst_PROGRAMS)
+TESTS_ENVIRONMENT = $(srcdir)/run_test.pl -t
+  }
 }
 
 project(Framework Component DLL) : acelib {
@@ -65,6 +71,7 @@ project(DLL Test Lib) : acelib, dll_test_parent_lib {
 }
 
 project(Based Pointer Test Lib) : acelib {
+  avoids      += ace_for_tao
   sharedname   = Based_Pointer_Test_Lib
   dynamicflags = ACE_SVC_BUILD_DLL
 
@@ -168,6 +175,7 @@ project(Basic Types Test) : acetest {
 }
 
 project(Bound Ptr Test) : acetest {
+  avoids += ace_for_tao
   exename = Bound_Ptr_Test
   Source_Files {
     Bound_Ptr_Test.cpp
@@ -188,6 +196,13 @@ project(Bug_1576_Regression_Test) : acetest {
   }
 }
 
+project(Bug_2497_Regression_Test) : acetest {
+  exename = Bug_2497_Regression_Test
+  Source_Files {
+    Bug_2497_Regression_Test.cpp
+  }
+}
+
 project(Cache Map Manager Test) : acetest {
   exename = Cache_Map_Manager_Test
   Source_Files {
@@ -196,6 +211,7 @@ project(Cache Map Manager Test) : acetest {
 }
 
 project(Memcpy_Test) : acetest {
+  avoids += ace_for_tao
   exename = Memcpy_Test
   Source_Files {
     Memcpy_Test.cpp
@@ -203,6 +219,7 @@ project(Memcpy_Test) : acetest {
 }
 
 project(Cached Accept Conn Test) : acetest {
+  avoids += ace_for_tao
   exename = Cached_Accept_Conn_Test
   Source_Files {
     Cached_Accept_Conn_Test.cpp
@@ -210,6 +227,7 @@ project(Cached Accept Conn Test) : acetest {
 }
 
 project(Cached Allocator Test) : acetest {
+  avoids += ace_for_tao
   exename = Cached_Allocator_Test
   Source_Files {
     Cached_Allocator_Test.cpp
@@ -217,6 +235,7 @@ project(Cached Allocator Test) : acetest {
 }
 
 project(Cached Conn Test) : acetest {
+  avoids += ace_for_tao
   exename = Cached_Conn_Test
   Source_Files {
     Cached_Conn_Test.cpp
@@ -224,6 +243,7 @@ project(Cached Conn Test) : acetest {
 }
 
 project(Capabilities Test) : acetest {
+  avoids += ace_for_tao
   exename = Capabilities_Test
   Source_Files {
     Capabilities_Test.cpp
@@ -231,6 +251,7 @@ project(Capabilities Test) : acetest {
 }
 
 project(CDR File Test) : acetest {
+  avoids += ace_for_tao
   exename = CDR_File_Test
   Source_Files {
     CDR_File_Test.cpp
@@ -253,6 +274,7 @@ project(Collection Test) : acetest {
 }
 
 project(Config Test) : acetest {
+  avoids += ace_for_tao
   exename = Config_Test
   Source_Files {
     Config_Test.cpp
@@ -264,6 +286,7 @@ project(Config Test) : acetest {
 }
 
 project(Conn Test) : acetest {
+  avoids += ace_for_tao
   exename = Conn_Test
   Source_Files {
     Conn_Test.cpp
@@ -271,6 +294,7 @@ project(Conn Test) : acetest {
 }
 
 project(Date Time Test) : acetest {
+  avoids += ace_for_tao
   exename = Date_Time_Test
   Source_Files {
     Date_Time_Test.cpp
@@ -285,6 +309,7 @@ project(Dev Poll Reactor Test) : acetest {
 }
 
 project(Dirent Test) : acetest {
+
   exename = Dirent_Test
   Source_Files {
     Dirent_Test.cpp
@@ -292,6 +317,7 @@ project(Dirent Test) : acetest {
 }
 
 project(DLList Test) : acetest {
+  avoids += ace_for_tao
   exename = DLList_Test
   Source_Files {
     DLList_Test.cpp
@@ -322,6 +348,7 @@ project(Env Value Test) : acetest {
 }
 
 project(Future Test) : acetest {
+  avoids += ace_for_tao
   exename = Future_Test
   Source_Files {
     Future_Test.cpp
@@ -329,6 +356,7 @@ project(Future Test) : acetest {
 }
 
 project(Future Set Test) : acetest {
+  avoids += ace_for_tao
   exename = Future_Set_Test
   Source_Files {
     Future_Set_Test.cpp
@@ -343,6 +371,7 @@ project(Get Opt Test) : acetest {
 }
 
 project(Handle Set Test) : acetest {
+  avoids += ace_for_tao
   exename = Handle_Set_Test
   Source_Files {
     Handle_Set_Test.cpp
@@ -350,6 +379,7 @@ project(Handle Set Test) : acetest {
 }
 
 project(High Res Timer Test) : acetest {
+  avoids += ace_for_tao
   exename = High_Res_Timer_Test
   Source_Files {
     High_Res_Timer_Test.cpp
@@ -392,6 +422,7 @@ project(Lazy Map Manager Test) : acetest {
 }
 
 project(Log Msg Test) : acetest {
+  avoids += ace_for_tao
   exename = Log_Msg_Test
   Source_Files {
     Log_Msg_Test.cpp
@@ -406,6 +437,7 @@ project(Logging Strategy Test) : acetest {
 }
 
 project(Malloc Test) : acetest {
+  avoids += ace_for_tao
   exename = Malloc_Test
   Source_Files {
     Malloc_Test.cpp
@@ -420,6 +452,7 @@ project(Manual_Event Test) : acetest {
 }
 
 project(Map Test) : acetest {
+  avoids += ace_for_tao
   exename = Map_Test
   Source_Files {
     Map_Test.cpp
@@ -427,6 +460,7 @@ project(Map Test) : acetest {
 }
 
 project(Map Manager Test) : acetest {
+  avoids += ace_for_tao
   exename = Map_Manager_Test
   Source_Files {
     Map_Manager_Test.cpp
@@ -441,6 +475,7 @@ project(Max Default Port Test) : acetest {
 }
 
 project(MEM Stream Test) : acetest {
+  avoids += ace_for_tao
   exename = MEM_Stream_Test
   Source_Files {
     MEM_Stream_Test.cpp
@@ -448,6 +483,7 @@ project(MEM Stream Test) : acetest {
 }
 
 project(Mem Map Test) : acetest {
+  avoids += ace_for_tao
   exename = Mem_Map_Test
   Source_Files {
     Mem_Map_Test.cpp
@@ -455,6 +491,7 @@ project(Mem Map Test) : acetest {
 }
 
 project(MM Shared Memory Test) : acetest {
+  avoids += ace_for_tao
   exename = MM_Shared_Memory_Test
   Source_Files {
     MM_Shared_Memory_Test.cpp
@@ -483,6 +520,7 @@ project(MT SOCK Test) : acetest {
 }
 
 project(Message Block Test) : acetest {
+  avoids += ace_for_tao
   exename = Message_Block_Test
   Source_Files {
     Message_Block_Test.cpp
@@ -490,6 +528,7 @@ project(Message Block Test) : acetest {
 }
 
 project(Message Queue Test) : acetest {
+  avoids += ace_for_tao
   exename = Message_Queue_Test
   Source_Files {
     Message_Queue_Test.cpp
@@ -497,6 +536,7 @@ project(Message Queue Test) : acetest {
 }
 
 project(Message Queue Test Ex) : acetest {
+  avoids += ace_for_tao
   exename = Message_Queue_Test_Ex
   Source_Files {
     Message_Queue_Test_Ex.cpp
@@ -518,6 +558,7 @@ project(Multicast Test) : acetest {
 }
 
 project(Multihomed INET Addr Test) : acetest {
+  avoids += ace_for_tao
   exename = Multihomed_INET_Addr_Test
   Source_Files {
     Multihomed_INET_Addr_Test.cpp
@@ -539,6 +580,7 @@ project(New Fail Test) : acetest {
 }
 
 project(Notify Performance Test) : acetest {
+  avoids += ace_for_tao
   exename = Notify_Performance_Test
   Source_Files {
     Notify_Performance_Test.cpp
@@ -574,6 +616,7 @@ project(OS Test) : acetest {
 }
 
 project(Proactor Scatter Gather Test) : acetest {
+  avoids += ace_for_tao
   exename = Proactor_Scatter_Gather_Test
   Source_Files {
     Proactor_Scatter_Gather_Test.cpp
@@ -581,6 +624,7 @@ project(Proactor Scatter Gather Test) : acetest {
 }
 
 project(Proactor Test) : acetest {
+  avoids += ace_for_tao
   exename = Proactor_Test
   Source_Files {
     Proactor_Test.cpp
@@ -588,6 +632,7 @@ project(Proactor Test) : acetest {
 }
 
 project(Proactor Timer Test) : acetest {
+  avoids += ace_for_tao
   exename = Proactor_Timer_Test
   Source_Files {
     Proactor_Timer_Test.cpp
@@ -602,6 +647,7 @@ project(Process Manual Event Test) : acetest {
 }
 
 project(Process Mutex Test) : acetest {
+  avoids += ace_for_tao
   exename = Process_Mutex_Test
   Source_Files {
     Process_Mutex_Test.cpp
@@ -609,6 +655,7 @@ project(Process Mutex Test) : acetest {
 }
 
 project(Process Semaphore Test) : acetest {
+  avoids += ace_for_tao
   exename = Process_Semaphore_Test
   Source_Files {
     Process_Semaphore_Test.cpp
@@ -616,6 +663,7 @@ project(Process Semaphore Test) : acetest {
 }
 
 project(Process Strategy Test) : acetest {
+  avoids += ace_for_tao    // Requires ace/File_Lock
   exename = Process_Strategy_Test
   Source_Files {
     Process_Strategy_Test.cpp
@@ -644,6 +692,7 @@ project(Priority Task Test) : acetest {
 }
 
 project(Priority Reactor Test) : acetest {
+  avoids += ace_for_tao
   exename = Priority_Reactor_Test
   Source_Files {
     Priority_Reactor_Test.cpp
@@ -651,6 +700,7 @@ project(Priority Reactor Test) : acetest {
 }
 
 project(Process Manager Test) : acetest {
+  avoids += ace_for_tao
   exename = Process_Manager_Test
   Source_Files {
     Process_Manager_Test.cpp
@@ -686,6 +736,7 @@ project(Reactor Exceptions Test) : acetest {
 }
 
 project(Reactor Notify Test) : acetest {
+  avoids += ace_for_tao
   exename = Reactor_Notify_Test
   Source_Files {
     Reactor_Notify_Test.cpp
@@ -707,6 +758,7 @@ project(Reactor Dispatch Order Test) : acetest {
 }
 
 project(Reactor Performance Test) : acetest {
+  avoids += ace_for_tao
   exename = Reactor_Performance_Test
   Source_Files {
     Reactor_Performance_Test.cpp
@@ -714,6 +766,7 @@ project(Reactor Performance Test) : acetest {
 }
 
 project(Reactor Timer Test) : acetest {
+  avoids += ace_for_tao
   exename = Reactor_Timer_Test
   Source_Files {
     Reactor_Timer_Test.cpp
@@ -749,6 +802,7 @@ project(Recursive Mutex Test) : acetest {
 }
 
 project(Refcounted Auto Ptr Test) : acetest {
+  avoids += ace_for_tao
   exename = Refcounted_Auto_Ptr_Test
   Source_Files {
     Refcounted_Auto_Ptr_Test.cpp
@@ -763,6 +817,7 @@ project(Reverse Lock Test) : acetest {
 }
 
 project(Semaphore Test) : acetest {
+  avoids += ace_for_tao
   exename = Semaphore_Test
   Source_Files {
     Semaphore_Test.cpp
@@ -819,6 +874,7 @@ project(SOCK Send Recv Test) : acetest {
 }
 
 project(SPIPE Test) : acetest {
+  avoids += ace_for_tao
   exename = SPIPE_Test
   Source_Files {
     SPIPE_Test.cpp
@@ -833,6 +889,7 @@ project(SString Test) : acetest {
 }
 
 project(SV Shared Memory Test) : acetest {
+  avoids += ace_for_tao
   exename = SV_Shared_Memory_Test
   Source_Files {
     SV_Shared_Memory_Test.cpp
@@ -840,6 +897,7 @@ project(SV Shared Memory Test) : acetest {
 }
 
 project(Svc Handler Test) : acetest {
+  avoids += ace_for_tao
   exename = Svc_Handler_Test
   Source_Files {
     Svc_Handler_Test.cpp
@@ -903,6 +961,7 @@ project(Time Value Test) : acetest {
 }
 
 project(Timer Queue Test) : acetest {
+  avoids += ace_for_tao
   exename = Timer_Queue_Test
   Source_Files {
     Timer_Queue_Test.cpp
@@ -917,6 +976,7 @@ project(Token Strategy Test) : acetest {
 }
 
 project(TP Reactor Test) : acetest {
+  avoids += ace_for_tao
   exename = TP_Reactor_Test
   Source_Files {
     TP_Reactor_Test.cpp
@@ -945,6 +1005,7 @@ project(Vector Test) : acetest {
 }
 
 project(UPIPE SAP Test) : acetest {
+  avoids += ace_for_tao
   exename = UPIPE_SAP_Test
   Source_Files {
     UPIPE_SAP_Test.cpp
@@ -952,6 +1013,7 @@ project(UPIPE SAP Test) : acetest {
 }
 
 project(Upgradable RW Test) : acetest {
+  avoids += ace_for_tao
   exename = Upgradable_RW_Test
   Source_Files {
     Upgradable_RW_Test.cpp
@@ -959,6 +1021,7 @@ project(Upgradable RW Test) : acetest {
 }
 
 project(Naming Test) : acetest {
+  avoids   += ace_for_tao
   exename   = Naming_Test
   requires += ace_other
 
@@ -1017,6 +1080,7 @@ project(TkReactor Test) : acetest,ace_tkreactor {
 }
 
 project(Codecs Test) : acetest {
+  avoids   += ace_for_tao
   exename   = Codecs_Test
   requires += ace_codecs
 
@@ -1035,6 +1099,7 @@ project(Tokens Test) : acetest {
 }
 
 project(CDR Array Test) : acetest {
+  avoids += ace_for_tao
   exename = CDR_Array_Test
   Source_Files {
     CDR_Array_Test.cpp
@@ -1058,6 +1123,7 @@ project(Framework Component Test) : acetest {
 }
 
 project(FIFO Test) : acetest {
+  avoids += ace_for_tao
   exename = FIFO_Test
   Source_Files {
     FIFO_Test.cpp
@@ -1139,6 +1205,7 @@ project(Reactor Registration Test) : acetest {
 }
 
 project(UUIDTest) : acetest {
+  avoids   += ace_for_tao
   exename   = UUIDTest
   requires += ace_uuid
   Source_Files {
@@ -1175,13 +1242,15 @@ project(Multicast Test IPV6) : acetest {
 }
 
 project(Multihomed INET Addr Test IPV6) : acetest {
-  exename =   Multihomed_INET_Addr_Test_IPV6
+  avoids += ace_for_tao
+  exename = Multihomed_INET_Addr_Test_IPV6
   Source_Files {
   Multihomed_INET_Addr_Test_IPV6.cpp
   }
 }
 
 project(Proactor Test IPV6) : acetest {
+  avoids += ace_for_tao
   exename =  Proactor_Test_IPV6
   Source_Files {
    Proactor_Test_IPV6.cpp
@@ -1203,6 +1272,7 @@ project(SOCK Test IPv6) : acetest {
 }
 
 project(SOCK_Dgram_Bcast_Test) : acetest {
+  avoids += ace_for_tao
   exename = SOCK_Dgram_Bcast_Test
   Source_Files {
   	SOCK_Dgram_Bcast_Test.cpp
@@ -1210,6 +1280,7 @@ project(SOCK_Dgram_Bcast_Test) : acetest {
 }
 
 project(SOCK_SEQPACK_SCTP_Test) : acetest {
+  avoids += ace_for_tao
   exename = SOCK_SEQPACK_SCTP_Test
   Source_Files {
   	SOCK_SEQPACK_SCTP_Test.cpp
@@ -1228,6 +1299,7 @@ project(QtReactor Test) : acetest, ace_qtreactor {
 }
 
 project(Based Pointer Test) : acetest {
+  avoids += ace_for_tao
   after  += Based_Pointer_Test_Lib
   exename = Based_Pointer_Test
   Source_Files {
@@ -1241,3 +1313,13 @@ project(WChar_Conversion) : acetest {
     WChar_Conversion.cpp
   }
 }
+
+project(Library Unload) {
+  exename = UnloadLibACE
+  staticflags += ACE_AS_STATIC_LIBS
+  Source_Files {
+    Unload_libACE.cpp
+  }
+  Resource_Files {
+  }
+}