Exclude additional tests from single threaded configurations

6 files changed, 27 insertions, 11 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 150a3c38440..71fb301e38a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Fri Mar  8 20:06:15 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+
+          Dont run the servers_list test in single threaded configuration.
+
+        * orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc:
+
+          Don't build servers_list in a single threaded configuration.
+
+        * tests/Dynamic_TP/Config_Loader/Config_Loader.mpc:
+        * tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc:
+        * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc:
+
+          Don't build Dynamic_TP tests in a single threaded configuration.
+
 Fri Mar  8 16:13:18 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
 
         * orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc:
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index bc88c2b4b16..642fb9d0d5c 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -128,7 +128,7 @@ TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: !MINIMUM !CORBA_E_COMPACT !C
 TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO
 TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
-TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO
 TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc b/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
index e20c642631a..eddb8a3e628 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micro {
+project(*server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micro, threads {
   after += *idl
   exename = server
   IDL_Files {
@@ -22,7 +22,7 @@ project(*server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micr
   }
 }
 
-project(*client): taoclient, anytypecode, avoids_minimum_corba {
+project(*client): taoclient, anytypecode, avoids_minimum_corba, threads {
   after += *idl
   exename = client
   Source_Files {
diff --git a/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc b/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
index 67608a907eb..72e41407555 100644
--- a/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
+++ b/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
@@ -1,5 +1,5 @@
 // $Id$
 
-project(*test) : dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*test) : dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   exename = test
 }
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc b/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
index 815a8f209dd..c7dbc16435e 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(*Server): taoserver, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Server): taoserver, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   after += *idl
   Source_Files {
     Test_i.cpp
@@ -22,7 +22,7 @@ project(*Server): taoserver, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_
 
 }
 
-project(*Middle): taoserver, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Middle): taoserver, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   exename=middle
   after += *idl
   Source_Files {
@@ -37,7 +37,7 @@ project(*Middle): taoserver, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_
 
 }
 
-project(*Client): taoclient, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Client): taoclient, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   after += *idl
   Source_Files {
     TestC.cpp
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
index 3f8ab658b4f..7c4fa704639 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   IDL_Files {
     Test.idl
   }
   custom_only = 1
 }
 
-project(Dynamic_TP_POA_Test_Dynamic_Server): taoserver, csd_framework, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro {
+project(Dynamic_TP_POA_Test_Dynamic_Server): taoserver, csd_framework, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   after += *idl
   Source_Files {
     Hello.cpp
@@ -22,7 +22,7 @@ project(Dynamic_TP_POA_Test_Dynamic_Server): taoserver, csd_framework, dynamic_t
 
 }
 
-project(Dynamic_TP_POA_Test_Dynamic_Client): taoclient, avoids_corba_e_compact, avoids_corba_e_micro {
+project(Dynamic_TP_POA_Test_Dynamic_Client): taoclient, avoids_corba_e_compact, avoids_corba_e_micro, threads {
   after += Dynamic_TP_POA_Test_Dynamic_Server
   Source_Files {
     TestC.cpp