diff options
Diffstat (limited to 'TAO/tests/RTCORBA')
13 files changed, 44 insertions, 24 deletions
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc index 7138aa20720..2e4c9d4fd1f 100644 --- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc +++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc @@ -1,14 +1,16 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, rtcorba, minimum_corba { +project(*client) : taoexe, portableserver, rtcorba { + avoids += minimum_corba source_files { client.cpp Custom_Network_Priority_Mapping.cpp } } -project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba { +project(*server) : taoexe, rtportableserver, rtcorba { + avoids += minimum_corba source_files { server.cpp Custom_Network_Priority_Mapping.cpp diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index 10ba9a8a48f..5b41a9b0826 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server { + avoids += minimum_corba Source_Files { server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc index 0f82a323a72..16c54a31b82 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc +++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server { + avoids += minimum_corba Source_Files { server.cpp } } -project(*Client): rt_client, minimum_corba { +project(*Client): rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc index 10ba9a8a48f..5b41a9b0826 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server { + avoids += minimum_corba Source_Files { server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 0662db7fb4e..81573c2dfab 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server { + avoids += minimum_corba Source_Files { server.cpp } } -project(*Client): taoexe, minimum_corba { +project(*Client): taoexe { + avoids += minimum_corba requires += rt_corba Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc index 1e97eefaee4..b4b68d36e7a 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.mpc +++ b/TAO/tests/RTCORBA/Policies/Policies.mpc @@ -1,5 +1,6 @@ // -*- MPC -*- // $Id$ -project(RTCORBA Policies Server): rt_server, minimum_corba { +project(RTCORBA Policies Server): rt_server { + avoids += minimum_corba } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc index 49d690018fd..399abfea95e 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server { + avoids += minimum_corba Source_Files { server.cpp } diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc index 4cb4bcb6c23..6902d4a09fb 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc @@ -1,14 +1,16 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server { + avoids += minimum_corba Source_Files { test_i.cpp server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc index 0f82a323a72..16c54a31b82 100644 --- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc +++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server { + avoids += minimum_corba Source_Files { server.cpp } } -project(*Client): rt_client, minimum_corba { +project(*Client): rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc index 81a533380b3..220bbb47171 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc @@ -1,11 +1,13 @@ // $Id$ -project(*Server): rt_server, strategies, portableserver, minimum_corba { +project(*Server): rt_server, strategies, portableserver { + avoids += minimum_corba Source_Files { server.cpp } } -project(*Client): rt_client, strategies, portableserver, minimum_corba { +project(*Client): rt_client, strategies, portableserver { + avoids += minimum_corba Source_Files { client.cpp } diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp index a232f56b1af..12964d835bc 100644 --- a/TAO/tests/RTCORBA/RTMutex/server.cpp +++ b/TAO/tests/RTCORBA/RTMutex/server.cpp @@ -485,8 +485,6 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) // Wait for the threads to exit. ACE_Thread_Manager::instance ()->wait (); - mutex->unlock (); - CORBA::release (mutex); } diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc index 10ba9a8a48f..5b41a9b0826 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -1,13 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server { + avoids += minimum_corba Source_Files { server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc index 4cb4bcb6c23..6902d4a09fb 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -1,14 +1,16 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server { + avoids += minimum_corba Source_Files { test_i.cpp server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp |