diff options
Diffstat (limited to 'TAO/tests/RTCORBA')
23 files changed, 45 insertions, 28 deletions
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp index f686e77bbe6..8dd1103b673 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp @@ -63,11 +63,11 @@ int main(int, char**) poaManager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - TestMonitorable_i* monitorable_i; + TestMonitorable_i* monitorable_i = 0; ACE_NEW_RETURN (monitorable_i, TestMonitorable_i, 1); PortableServer::ServantBase_var monitorable_var = monitorable_i; - TestMonitorable_i* m2; + TestMonitorable_i* m2 = 0; ACE_NEW_RETURN (m2, TestMonitorable_i, 1); PortableServer::ServantBase_var m2_var = m2; diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index c86f190bdb7..93234520b42 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -335,7 +335,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index 32ea7b07421..37fca92fdfa 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -367,7 +367,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Get the RTORB. CORBA::Object_var object = diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h index 8ea41d53689..569419fb346 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_CLIENT_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index dd0a0dce389..23d288d93b3 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -7,7 +7,7 @@ project(*Server): rt_server { } } -project(*Client): rt_client { +project(*Client): rt_client, interceptors { Source_Files { testC.cpp interceptors.cpp diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index c15039ca909..f5b3ab6294c 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -216,7 +216,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 100c213843f..195747652f5 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -269,7 +269,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index 630e2607318..bce9ae91ce8 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -930,7 +930,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are // required for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 704f51513c1..3b375bfd88d 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -338,7 +338,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index b81a3dbbec2..0b8dced204b 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -304,7 +304,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 3e18aed15f2..e884fd7068f 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -308,7 +308,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 4893b44106c..54aea3bba43 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -225,7 +225,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index bb9f688d7ca..e3df563cc73 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -158,7 +158,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // The following finds out the lowest priority for this // scheduling policy. This will give us the biggest range on NT diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index c8765bbc557..67afc2f54d9 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -925,7 +925,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index 480ae55a041..6b9d84e58e5 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -206,6 +206,11 @@ main (int argc, char *argv[]) if (result != 0) return result; + // Make sure we can support multiple priorities that are required + // for this test. + if (!check_supported_priorities (orb.in ())) + return -1; + // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index 4be4333121b..f5611fb661b 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -338,7 +338,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 259168276e8..8bb768a827f 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -579,7 +579,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index e24b4ee483b..15f92c7b99a 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -409,7 +409,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 8c01de8397d..61e79637b57 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -340,7 +340,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index d6cd667cc91..5f7730781b2 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -6,7 +6,6 @@ #include "tao/ORB_Core.h" #include "ace/Task.h" #include "ace/OS_NS_unistd.h" -#include "../check_supported_priorities.cpp" ACE_RCSID(Thread_Pool, client, "$Id$") diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index ebbb52926fd..7b7f159ea56 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -347,7 +347,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/check_supported_priorities.cpp b/TAO/tests/RTCORBA/check_supported_priorities.cpp index 2410c64dc5b..bfbff8af5ac 100644 --- a/TAO/tests/RTCORBA/check_supported_priorities.cpp +++ b/TAO/tests/RTCORBA/check_supported_priorities.cpp @@ -25,7 +25,7 @@ sched_policy_name (int sched_policy) return name; } -void +bool check_supported_priorities (CORBA::ORB_ptr orb) { int sched_policy = @@ -46,6 +46,8 @@ check_supported_priorities (CORBA::ORB_ptr orb) "Check svc.conf options\n", sched_policy_name (sched_policy))); - ACE_OS::exit (2); + return false; } + + return true; } diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp index 44a898cb176..b80ca5720d0 100644 --- a/TAO/tests/RTCORBA/common_args.cpp +++ b/TAO/tests/RTCORBA/common_args.cpp @@ -380,8 +380,3 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes, ACE_CHECK; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Array_Base<CORBA::ULong>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Array_Base<CORBA::ULong> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |