diff options
185 files changed, 835 insertions, 210 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9a0dddaa8bb..946f0aa1e33 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,203 @@ +Tue Feb 12 10:18:14 UTC 2008 Simon McQueen <sm@prismtech.com> + + * MPC/config/csd_pt_testinf_lib.mpb: + * MPC/config/csd_pt_testservant_lib.mpb: + * MPC/config/kokyu_dsrt_schedulers.mpb: + * MPC/config/notifytest.mpb: + * MPC/config/orbsvcslib.mpb: + * MPC/config/rtcorbacommon.mpb: + * MPC/config/taolib.mpb: + * docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc: + * docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc: + * docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc: + * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc: + * docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc: + * docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc: + * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc: + * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: + * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc: + * examples/RTScheduling/MIF_Scheduler/run_test.pl: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc: + * orbsvcs/IFR_Service/IFR_Service.mpc: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/PSS/PSDL.mpc: + * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc: + * orbsvcs/examples/Notify/Federation/Agent/Agent.mpc: + * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc: + * orbsvcs/orbsvcs/AV.mpc: + * orbsvcs/orbsvcs/CosConcurrency.mpc: + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosLifeCycle.mpc: + * orbsvcs/orbsvcs/CosLoadBalancing.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosNaming_Serv.mpc: + * orbsvcs/orbsvcs/CosNaming_Skel.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosProperty.mpc: + * orbsvcs/orbsvcs/CosTime.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + * orbsvcs/orbsvcs/DsEventLogAdmin.mpc: + * orbsvcs/orbsvcs/DsLogAdmin.mpc: + * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc: + * orbsvcs/orbsvcs/ETCL.mpc: + * orbsvcs/orbsvcs/FTORB.mpc: + * orbsvcs/orbsvcs/FaultTolerance.mpc: + * orbsvcs/orbsvcs/FtRtEvent.mpc: + * orbsvcs/orbsvcs/HTIOP.mpc: + * orbsvcs/orbsvcs/IFRService.mpc: + * orbsvcs/orbsvcs/PortableGroup.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTCosScheduling.mpc: + * orbsvcs/orbsvcs/RTEvent.mpc: + * orbsvcs/orbsvcs/RTEventLogAdmin.mpc: + * orbsvcs/orbsvcs/RTEvent_Serv.mpc: + * orbsvcs/orbsvcs/RTEvent_Skel.mpc: + * orbsvcs/orbsvcs/RTKokyuEvent.mpc: + * orbsvcs/orbsvcs/RTSched.mpc: + * orbsvcs/orbsvcs/RTSchedEvent.mpc: + * orbsvcs/orbsvcs/RT_Notification.mpc: + * orbsvcs/orbsvcs/SSLIOP.mpc: + * orbsvcs/orbsvcs/Security.mpc: + * orbsvcs/orbsvcs/Svc_Utils.mpc: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc: + * orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb: + * orbsvcs/tests/CosEvent/Basic/run_test.pl: + * orbsvcs/tests/Event/Basic/rteventtestexe.mpb: + * orbsvcs/tests/Event/Basic/run_test.pl: + * orbsvcs/tests/Event/Mcast/Complex/Complex.mpc: + * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc: + * orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc: + * orbsvcs/tests/Event/Performance/eventperftestexe.mpb: + * orbsvcs/tests/Event/Performance/run_test.pl: + * orbsvcs/tests/Notify/Basic/run_test.pl: + * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: + * orbsvcs/tests/Notify/Blocking/run_test.pl: + * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: + * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: + * orbsvcs/tests/Notify/Discarding/run_test.pl: + * orbsvcs/tests/Notify/MC/run_test.pl: + * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: + * orbsvcs/tests/Notify/Ordering/run_test.pl: + * orbsvcs/tests/Notify/Reconnecting/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: + * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: + * performance-tests/CSD_Strategy/TestApps/run_test.pl: + * tao/AnyTypeCode.mpc: + * tao/BiDir_GIOP.mpc: + * tao/BiDir_GIOP/BiDirGIOP.cpp: + * tao/CSD_Framework.mpc: + * tao/CSD_ThreadPool.mpc: + * tao/CodecFactory.mpc: + * tao/Codeset.mpc: + * tao/Compression.mpc: + * tao/DiffServPolicy.mpc: + * tao/DynamicAny.mpc: + * tao/DynamicInterface.mpc: + * tao/EndpointPolicy.mpc: + * tao/IFR_Client.mpc: + * tao/IORInterceptor.mpc: + * tao/IORManipulation.mpc: + * tao/IORTable.mpc: + * tao/ImR_Client.mpc: + * tao/Messaging.mpc: + * tao/ObjRefTemplate.mpc: + * tao/PI.mpc: + * tao/PI_Server.mpc: + * tao/PortableServer.mpc: + * tao/RTCORBA.mpc: + * tao/RTPortableServer.mpc: + * tao/RTScheduler.mpc: + * tao/SmartProxies.mpc: + * tao/Strategies.mpc: + * tao/TC.mpc: + * tao/TC_IIOP.mpc: + * tao/TypeCodeFactory.mpc: + * tao/Utils.mpc: + * tao/Valuetype.mpc: + * tao/ZlibCompressor.mpc: + * tests/CSD_Strategy_Tests/Broken/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: + * tests/Collocation/run_test.pl: + * tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc: + * tests/POA/Adapter_Activator/run_test.pl: + * tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc: + * tests/POA/Explicit_Activation/run_test.pl: + * tests/POA/Loader/run_test.pl: + * tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc: + * tests/POA/On_Demand_Activation/run_test.pl: + * tests/POA/On_Demand_Loading/run_test.pl: + * tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc: + * tests/POA/Reference_Counted_Servant/run_test.pl: + * tests/RTCORBA/Persistent_IOR/run_test.pl: + * tests/TransportCurrent/Framework/run_test.pl: + * tests/TransportCurrent/IIOP/run_test.pl: + + Changes to fix bug #3192. In summary these are: + Add *_output.mpb base projects to mpc files for ORB core and ORB + service libraries to direct their libraries into $ACE_ROOT/lib. + Add extra library paths into test mpc files and test run scripts so + that they can locate libraries that are not in the above category + (e.g. test / example libraries). + + * tests/BiDirectional/run_test.pl: + * tests/Bug_1020_Basic_Regression/run_test.pl: + * tests/Bug_1020_Regression/run_test.pl: + * tests/Bug_1269_Regression/run_test.pl: + * tests/Bug_1270_Regression/run_test.pl: + * tests/Bug_1361_Regression/run_test.pl: + * tests/Bug_1482_Regression/run_test.pl: + * tests/Bug_1551_Regression/run_test.pl: + * tests/Oneways_Invoking_Twoways/Client_Task.h: + * tests/Oneways_Invoking_Twoways/Client_Task.cpp: + * tests/Oneways_Invoking_Twoways/Receiver_i.h: + * tests/Oneways_Invoking_Twoways/Receiver_i.cpp: + * tests/Oneways_Invoking_Twoways/Sender_i.h: + * tests/Oneways_Invoking_Twoways/Sender_i.cpp: + * tests/Oneways_Invoking_Twoways/Test.idl: + * tests/Oneways_Invoking_Twoways/client.cpp: + * tests/Crash_On_Write/client.cpp: + * tests/Crash_On_Write/server.cpp: + * tests/Crashed_Callback/Service.h: + * tests/Crashed_Callback/Service.cpp: + * tests/Crashed_Callback/server.cpp: + * tests/Parallel_Connect_Strategy/client.cpp: + * tests/Parallel_Connect_Strategy/run_test.pl: + * tests/Server_Connection_Purging/Server_Connection_Purging.mpc: + * tests/Server_Connection_Purging/Test.idl: + * tests/Server_Connection_Purging/Test_i.h: + * tests/Server_Connection_Purging/Test_i.cpp: + * tests/Server_Connection_Purging/client.cpp: + * tests/Server_Connection_Purging/client2.cpp: + * tests/Server_Connection_Purging/run_test.pl: + * tests/Server_Connection_Purging/server.cpp: + * tests/Single_Read/run_test.pl: + * tests/Single_Read/test_i.h: + * tests/Single_Read/test_i.cpp: + * tests/Stack_Recursion/client.cpp: + * tests/Stack_Recursion/run_test.pl: + * tests/Nested_Upcall_Crash/run_test.pl: + * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp: + * tests/RTScheduling/Thread_Cancel/test.cpp: + + Made changes to make these tests take more reasonable times to run. In + some cases this is simply removal of unecessary inefficiencies. On + others this has been the addition of a -quick argument to optionally + reduce the amount of repetition or similar in the scenario. + Mon Feb 11 20:51:59 UTC 2008 Ciju John <johnc at ociweb dot com> Merging in changes from branch "Bug_3193". Here are the individual diff --git a/TAO/MPC/config/csd_pt_testinf_lib.mpb b/TAO/MPC/config/csd_pt_testinf_lib.mpb index 74affa4ba7d..cd490bd2eef 100644 --- a/TAO/MPC/config/csd_pt_testinf_lib.mpb +++ b/TAO/MPC/config/csd_pt_testinf_lib.mpb @@ -5,6 +5,7 @@ project : csd_threadpool, taolib_with_idl { after += csd_pt_testinf includes += $(TAO_ROOT)/performance-tests/CSD_Strategy libs += CSD_PT_TestInf + libpaths += $(TAO_ROOT)/performance-tests/CSD_Strategy/TestInf idlflags += -I$(TAO_ROOT)/performance-tests/CSD_Strategy specific(automake) { diff --git a/TAO/MPC/config/csd_pt_testservant_lib.mpb b/TAO/MPC/config/csd_pt_testservant_lib.mpb index 1eba36eae83..90593584c76 100644 --- a/TAO/MPC/config/csd_pt_testservant_lib.mpb +++ b/TAO/MPC/config/csd_pt_testservant_lib.mpb @@ -4,4 +4,5 @@ project : csd_pt_testinf_lib { after += csd_pt_testservant libs += CSD_PT_TestServant + libpaths += $(TAO_ROOT)/performance-tests/CSD_Strategy/TestServant } diff --git a/TAO/MPC/config/kokyu_dsrt_schedulers.mpb b/TAO/MPC/config/kokyu_dsrt_schedulers.mpb index 7974628140c..896f4c3c57d 100644 --- a/TAO/MPC/config/kokyu_dsrt_schedulers.mpb +++ b/TAO/MPC/config/kokyu_dsrt_schedulers.mpb @@ -5,6 +5,7 @@ project: codecfactory, rtcorba, kokyu, rtscheduling { after += Kokyu_DSRT_Schedulers libs += Kokyu_DSRT_Schedulers includes += $(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + libpaths += $(TAO_ROOT)/examples/Kokyu_dsrt_schedulers specific(automake) { includes += $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers diff --git a/TAO/MPC/config/notifytest.mpb b/TAO/MPC/config/notifytest.mpb index 5bbefec12d5..23ba2211a06 100644 --- a/TAO/MPC/config/notifytest.mpb +++ b/TAO/MPC/config/notifytest.mpb @@ -5,6 +5,7 @@ project: orbsvcsexe, notification, notification_skel, notification_serv, naming, after += NotifyTests_Lib libs += TAO_NotifyTests includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib + libpaths += $(TAO_ROOT)/orbsvcs/tests/Notify/lib specific(automake) { includes += $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib diff --git a/TAO/MPC/config/orbsvcslib.mpb b/TAO/MPC/config/orbsvcslib.mpb index 483b93b2412..6b573785599 100644 --- a/TAO/MPC/config/orbsvcslib.mpb +++ b/TAO/MPC/config/orbsvcslib.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib_with_idl, orbsvcs_output, anytypecode { +project : taolib_with_idl, anytypecode { tagname = TAO_ORBSVCS includes += $(TAO_ROOT)/orbsvcs idlflags += -I$(TAO_ROOT)/orbsvcs diff --git a/TAO/MPC/config/rtcorbacommon.mpb b/TAO/MPC/config/rtcorbacommon.mpb index cba4215883d..4acf222e07e 100644 --- a/TAO/MPC/config/rtcorbacommon.mpb +++ b/TAO/MPC/config/rtcorbacommon.mpb @@ -4,6 +4,7 @@ project : portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTCORBA_Common libs += RTCORBA_Common + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common diff --git a/TAO/MPC/config/taolib.mpb b/TAO/MPC/config/taolib.mpb index 153fd23de59..fc525272e7f 100644 --- a/TAO/MPC/config/taolib.mpb +++ b/TAO/MPC/config/taolib.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : acelib, ace_for_tao, tao_output, taodefaults, pidl, corba_e_micro, corba_e_compact, core_minimum_corba, link_codecfactory { +project : acelib, ace_for_tao, taodefaults, pidl, corba_e_micro, corba_e_compact, core_minimum_corba, link_codecfactory { after += TAO Codeset libs += TAO } diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc index 28cb1412d21..73402db9d83 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc @@ -9,6 +9,7 @@ project(*client) : orbsvcsexe, portableserver, naming { includes += $(srcdir)/../idl } includes += ../idl + libpaths += ../idl source_files { client.cpp @@ -23,6 +24,7 @@ project(*server) : orbsvcsexe, portableserver, naming { includes += $(srcdir)/../idl } includes += ../idl + libpaths += ../idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc index 39350e69199..64ef8e732ff 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc @@ -9,4 +9,5 @@ project : taoexe, portableserver { includes += $(srcdir)/../../idl } includes += ../../idl + libpaths += ../../idl } diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc index d66ed413d6e..137e0ca1476 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc @@ -9,6 +9,7 @@ project(*client) : taoexe, portableserver, rtevent, naming { includes += $(srcdir)/../../idl } includes += ../../idl + libpaths += ../../idl source_files { client.cpp @@ -23,6 +24,7 @@ project(*server) : taoserver, rtevent, naming, iortable { includes += $(srcdir)/../../idl } includes += ../../idl + libpaths += ../../idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc index 67da7604b8e..350f762520f 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc @@ -7,4 +7,5 @@ project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_ includes += $(srcdir)/../../idl } includes += ../../idl + libpaths += ../../idl } diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc index 5685980514b..12a1fbfcd94 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc @@ -9,6 +9,7 @@ project(*client) : taoexe, portableserver { includes += $(srcdir)/../../idl } includes += ../../idl + libpaths += ../../idl source_files { client.cpp @@ -23,6 +24,7 @@ project(*server) : taoserver, avoids_corba_e_micro { includes += $(srcdir)/../../idl } includes += ../../idl + libpaths += ../../idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc index 5cbce4fb41e..7c28078630c 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc @@ -9,4 +9,5 @@ project : taoserver { includes += $(srcdir)/../../idl } includes += ../../idl + libpaths += ../../idl } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc index 55f4576f2c4..2d434e71d6b 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc @@ -4,6 +4,7 @@ project(*Starter): portableserver, namingexe { after += MIF_Scheduler_Starter libs += RTSchedSynch + libpaths += .. specific (automake) { includes += $(TAO_ROOT)/examples/RTScheduling @@ -20,6 +21,7 @@ project(*Starter): portableserver, namingexe { project(*test) : namingexe, rtscheduling_server { after += *Starter RTSchedTestLib libs += RTSchedTestLib Job RTSchedSynch + libpaths += .. specific (automake) { includes += $(TAO_ROOT)/examples/RTScheduling diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl index 3a10c72930c..81195657379 100755 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('..'); + # amount of delay between running the servers $sleeptime = 2; diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc index 7f1d6c7b078..3412808f1e0 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc @@ -4,6 +4,7 @@ project(*Starter): portableserver, namingexe { after += RTSchedSynch libs += RTSchedSynch + libpaths += .. specific (automake) { includes += $(TAO_ROOT)/examples/RTScheduling @@ -20,6 +21,7 @@ project(*Starter): portableserver, namingexe { project(*test) : namingexe, rtscheduling_server { after += *Starter RTSchedTestLib libs += RTSchedTestLib Job RTSchedSynch + libpaths += .. idlflags += -SS -St -o .. specific (automake) { diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl index 3a10c72930c..81195657379 100755 --- a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl +++ b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('..'); + # amount of delay between running the servers $sleeptime = 2; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc index 2e98f977c0c..0acd91556a0 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { sharedname = TAO_ReplicationManagerLib dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index 51f5cb15555..e403da41ee2 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -16,7 +16,7 @@ project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client, } -project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, crosscompile, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += TAO_IDL_FE IFR_Service sharedname = TAO_IFR_BE libs += TAO_IDL_FE diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index c8a6e8e8534..d804abcd347 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,6 +1,6 @@ // $Id$ -project(ImR_Activator_IDL) : orbsvcslib, conv_lib, portableserver, imr_client, tao_versioning_idl_defaults { +project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, portableserver, imr_client, tao_versioning_idl_defaults { sharedname = TAO_ImR_Activator_IDL dynamicflags = ACTIVATOR_IDL_BUILD_DLL idlflags += -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h @@ -16,7 +16,7 @@ project(ImR_Activator_IDL) : orbsvcslib, conv_lib, portableserver, imr_client, t } } -project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_client, messaging, tao_versioning_idl_defaults { +project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, imr_client, messaging, tao_versioning_idl_defaults { sharedname = TAO_ImR_Locator_IDL after += ImR_Activator_IDL libs += TAO_ImR_Activator_IDL @@ -45,7 +45,7 @@ project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_ } } -project(ImR_Activator) : orbsvcslib, conv_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, imr_client, messaging, pi, codecfactory { +project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, imr_client, messaging, pi, codecfactory { sharedname = TAO_ImR_Activator dynamicflags = ACTIVATOR_BUILD_DLL after += ImR_Activator_IDL ImR_Locator_IDL @@ -65,7 +65,7 @@ project(ImR_Activator) : orbsvcslib, conv_lib, acexml, avoids_minimum_corba, avo } } -project(ImR_Locator) : orbsvcslib, conv_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iortable, portableserver, messaging, svc_utils, acexml, imr_client { +project(ImR_Locator) : orbsvcslib, orbsvcs_output, conv_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iortable, portableserver, messaging, svc_utils, acexml, imr_client { sharedname = TAO_ImR_Locator dynamicflags = LOCATOR_BUILD_DLL after += ImR_Locator_IDL ImR_Activator_IDL diff --git a/TAO/orbsvcs/PSS/PSDL.mpc b/TAO/orbsvcs/PSS/PSDL.mpc index d6e16be462f..57669e3426f 100644 --- a/TAO/orbsvcs/PSS/PSDL.mpc +++ b/TAO/orbsvcs/PSS/PSDL.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib { +project : taolib, tao_output { requires += dummy_label sharedname = TAO_PSDL dynamicflags += TAO_PSDL_BUILD_DLL @@ -33,7 +33,7 @@ project : taolib { } } -project(*Datastore) : taolib { +project(*Datastore) : taolib, tao_output { requires += dummy_label sharedname = TAO_PSDL_Datastore dynamicflags += TAO_PSDL_BUILD_DLL diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc index 0baee887ae0..482fcc7a42e 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc @@ -60,7 +60,7 @@ project(*TestServer) : orbsvcsexe, portableserver, iortable, avoids_corba_e_micr // Another simple server that can be loaded dynamically into the // combined_service. -project(*DynamicServer) : taolib, portableserver, iortable, avoids_corba_e_micro { +project(*DynamicServer) : taolib, tao_output, portableserver, iortable, avoids_corba_e_micro { dynamicflags = DYNSERVER_BUILD_DLL sharedname = DynServer after += *IDL diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc index 1083905d845..ef5307ffcfc 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc @@ -5,6 +5,7 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv exename = agent after += Gate libs += Gate + libpaths += ../Gate/. specific (automake) { includes += $(srcdir)/.. diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc index 8c44304de30..16f1ae1ad74 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc @@ -5,6 +5,7 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv exename = craft after += Gate libs += Gate + libpaths += ../Gate/. specific (automake) { includes += $(srcdir)/.. diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index f528a23427d..d467285bdd2 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(AV) : orbsvcslib, install, property_serv, naming, qos, tao_versioning_idl_defaults { +project(AV) : orbsvcslib, orbsvcs_output, install, property_serv, naming, qos, tao_versioning_idl_defaults { avoids += ace_for_tao sharedname = TAO_AV idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 690e0e4a4ac..42fadf6bd84 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosConcurrency_IDL): orbsvcslib, install, tao_versioning_idl_defaults { +project(CosConcurrency_IDL): orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h @@ -10,7 +10,7 @@ project(CosConcurrency_IDL): orbsvcslib, install, tao_versioning_idl_defaults { } } -project(CosConcurrency) : orbsvcslib, install { +project(CosConcurrency) : orbsvcslib, orbsvcs_output, install { sharedname = TAO_CosConcurrency dynamicflags = TAO_CONCURRENCY_BUILD_DLL tagchecks += Concurrency @@ -44,7 +44,7 @@ project(CosConcurrency) : orbsvcslib, install { } } -project(CosConcurrency_Skel): orbsvcslib, install, concurrency, portableserver { +project(CosConcurrency_Skel): orbsvcslib, orbsvcs_output, install, concurrency, portableserver { sharedname = TAO_CosConcurrency_Skel dynamicflags = TAO_CONCURRENCY_SKEL_BUILD_DLL tagchecks += Concurrency @@ -74,7 +74,7 @@ project(CosConcurrency_Skel): orbsvcslib, install, concurrency, portableserver { } } -project(CosConcurrency_Serv) : orbsvcslib, install, concurrency_skel, avoids_corba_e_micro { +project(CosConcurrency_Serv) : orbsvcslib, orbsvcs_output, install, concurrency_skel, avoids_corba_e_micro { sharedname = TAO_CosConcurrency_Serv dynamicflags = TAO_CONCURRENCY_SERV_BUILD_DLL tagchecks += Concurrency diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index ec8682e31c2..1b7ca867d45 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,6 +1,6 @@ // $Id$ -project (CosEvent_IDL) : orbsvcslib, install, avoids_minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults { +project (CosEvent_IDL) : orbsvcslib, orbsvcs_output, install, avoids_minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults { custom_only = 1 idlflags += -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h @@ -10,7 +10,7 @@ project (CosEvent_IDL) : orbsvcslib, install, avoids_minimum_corba, ec_typed_eve } } -project (CosEvent) : orbsvcslib, install, avoids_minimum_corba, ec_typed_events { +project (CosEvent) : orbsvcslib, orbsvcs_output, install, avoids_minimum_corba, ec_typed_events { sharedname = TAO_CosEvent dynamicflags = TAO_EVENT_BUILD_DLL tagchecks += CosEvent @@ -49,7 +49,7 @@ project (CosEvent) : orbsvcslib, install, avoids_minimum_corba, ec_typed_events } -project (CosEvent_Skel) : orbsvcslib, install, avoids_minimum_corba, event, portableserver, ec_typed_events_skel { +project (CosEvent_Skel) : orbsvcslib, orbsvcs_output, install, avoids_minimum_corba, event, portableserver, ec_typed_events_skel { sharedname = TAO_CosEvent_Skel dynamicflags = TAO_EVENT_SKEL_BUILD_DLL tagchecks += CosEvent @@ -86,7 +86,7 @@ project (CosEvent_Skel) : orbsvcslib, install, avoids_minimum_corba, event, port } -project (CosEvent_Serv) : orbsvcslib, install, avoids_minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils { +project (CosEvent_Serv) : orbsvcslib, orbsvcs_output, install, avoids_minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils { sharedname = TAO_CosEvent_Serv dynamicflags = TAO_EVENT_SERV_BUILD_DLL tagchecks += CosEvent diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index ee6811da2ea..aa71f9c9ee9 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosLifeCycle) : orbsvcslib, install, naming, portableserver, tao_versioning_idl_defaults { +project(CosLifeCycle) : orbsvcslib, orbsvcs_output, install, naming, portableserver, tao_versioning_idl_defaults { sharedname = TAO_CosLifeCycle idlflags += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h dynamicflags = TAO_LIFECYCLE_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index b32a579fde1..7d9406bbe62 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, install, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults { +project : orbsvcslib, orbsvcs_output, install, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults { sharedname = TAO_CosLoadBalancing idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h dynamicflags = TAO_LOADBALANCING_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index e32aef742de..a25cd2ccad7 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosNaming_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { +project(CosNaming_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h @@ -10,7 +10,7 @@ project(CosNaming_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { } } -project(CosNaming) : orbsvcslib, install { +project(CosNaming) : orbsvcslib, orbsvcs_output, install { sharedname = TAO_CosNaming dynamicflags = TAO_NAMING_BUILD_DLL tagchecks += Naming diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc index 2aed24d98bd..d2514ab814e 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(CosNaming_Serv) : orbsvcslib, install, naming_skel, messaging_optional, svc_utils, iortable { +project(CosNaming_Serv) : orbsvcslib, orbsvcs_output, install, naming_skel, messaging_optional, svc_utils, iortable { sharedname = TAO_CosNaming_Serv dynamicflags = TAO_NAMING_SERV_BUILD_DLL tagchecks += Naming diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc index 352d59af2ec..2c75f164a85 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosNaming_Skel) : orbsvcslib, install, naming, portableserver { +project(CosNaming_Skel) : orbsvcslib, orbsvcs_output, install, naming, portableserver { sharedname = TAO_CosNaming_Skel dynamicflags = TAO_NAMING_SKEL_BUILD_DLL tagchecks += Naming diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 4961ab6804a..b2bf627852e 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosNotification_IDL) : orbsvcslib, install, event, tao_versioning_idl_defaults { +project(CosNotification_IDL) : orbsvcslib, orbsvcs_output, install, event, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h @@ -15,7 +15,7 @@ project(CosNotification_IDL) : orbsvcslib, install, event, tao_versioning_idl_de } } -project(CosNotification) : orbsvcslib, install, event { +project(CosNotification) : orbsvcslib, orbsvcs_output, install, event { sharedname = TAO_CosNotification dynamicflags = TAO_NOTIFY_BUILD_DLL tagchecks += Notify @@ -67,7 +67,7 @@ project(CosNotification) : orbsvcslib, install, event { } -project(CosNotification_Skel) : orbsvcslib, install, notification, event_skel, portableserver { +project(CosNotification_Skel) : orbsvcslib, orbsvcs_output, install, notification, event_skel, portableserver { sharedname = TAO_CosNotification_Skel dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL tagchecks += Notify @@ -111,7 +111,7 @@ project(CosNotification_Skel) : orbsvcslib, install, notification, event_skel, p } } -project(CosNotification_Serv) : orbsvcslib, svc_utils, install, notification_skel, dynamicany, etcl{ +project(CosNotification_Serv) : orbsvcslib, orbsvcs_output, svc_utils, install, notification_skel, dynamicany, etcl{ sharedname = TAO_CosNotification_Serv dynamicflags = TAO_NOTIFY_SERV_BUILD_DLL tagchecks += Notify @@ -223,7 +223,7 @@ project(CosNotification_Serv) : orbsvcslib, svc_utils, install, notification_ske } -project(CosNotification_Persist) : notification_serv, install, acexml { +project(CosNotification_Persist) : notification_serv, orbsvcs_output, install, acexml { sharedname = TAO_CosNotification_Persist dynamicflags = TAO_NOTIFY_PERSIST_BUILD_DLL tagchecks += Notify @@ -246,7 +246,7 @@ project(CosNotification_Persist) : notification_serv, install, acexml { } } -project(CosNotification_MC): tao_versioning_idl_defaults, naming, portableserver, iortable, install { +project(CosNotification_MC): tao_versioning_idl_defaults, orbsvcs_output, naming, portableserver, iortable, install { sharedname = TAO_CosNotification_MC dynamicflags = TAO_NOTIFY_MC_BUILD_DLL tagchecks += Notify @@ -274,7 +274,7 @@ project(CosNotification_MC): tao_versioning_idl_defaults, naming, portableserver } } -project(CosNotification_MC_Ext): notification_serv, notification_mc, install { +project(CosNotification_MC_Ext): notification_serv, orbsvcs_output, notification_mc, install { sharedname = TAO_CosNotification_MC_Ext dynamicflags = TAO_NOTIFY_MC_EXT_BUILD_DLL tagchecks += Notify diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index 983cbb4da1b..ee884987e8c 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosProperty_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { +project(CosProperty_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h @@ -10,7 +10,7 @@ project(CosProperty_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { } } -project(CosProperty) : orbsvcslib, install { +project(CosProperty) : orbsvcslib, orbsvcs_output, install { sharedname = TAO_CosProperty dynamicflags = TAO_PROPERTY_BUILD_DLL tagchecks += Property @@ -44,7 +44,7 @@ project(CosProperty) : orbsvcslib, install { } } -project(CosProperty_Skel) : orbsvcslib, install, property, portableserver { +project(CosProperty_Skel) : orbsvcslib, orbsvcs_output, install, property, portableserver { sharedname = TAO_CosProperty_Skel dynamicflags = TAO_PROPERTY_SKEL_BUILD_DLL tagchecks += Property @@ -73,7 +73,7 @@ project(CosProperty_Skel) : orbsvcslib, install, property, portableserver { } } -project(CosProperty_Serv) : orbsvcslib, install, property_skel { +project(CosProperty_Serv) : orbsvcslib, orbsvcs_output, install, property_skel { sharedname = TAO_CosProperty_Serv dynamicflags = TAO_PROPERTY_SERV_BUILD_DLL tagchecks += Property diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index c871bbc5268..3ff45a1cba5 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosTime) : orbsvcslib, svc_utils, install, portableserver, tao_versioning_idl_defaults { +project(CosTime) : orbsvcslib, orbsvcs_output, svc_utils, install, portableserver, tao_versioning_idl_defaults { sharedname = TAO_CosTime idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h dynamicflags = TAO_TIME_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 4029634dff8..9c22dd57207 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosTrading_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { +project(CosTrading_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h @@ -13,7 +13,7 @@ project(CosTrading_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { } -project(CosTrading) : orbsvcslib, install { +project(CosTrading) : orbsvcslib, orbsvcs_output, install { sharedname = TAO_CosTrading dynamicflags = TAO_TRADING_BUILD_DLL tagchecks += Trader @@ -55,7 +55,7 @@ project(CosTrading) : orbsvcslib, install { } -project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver { +project(CosTrading_Skel) : orbsvcslib, orbsvcs_output, install, trading, portableserver { sharedname = TAO_CosTrading_Skel dynamicflags = TAO_TRADING_SKEL_BUILD_DLL tagchecks += Trader @@ -91,7 +91,7 @@ project(CosTrading_Skel) : orbsvcslib, install, trading, portableserver { } -project(CosTrading_Serv) : orbsvcslib, install, trading_skel, dynamicany, svc_utils, utils, iortable { +project(CosTrading_Serv) : orbsvcslib, orbsvcs_output, install, trading_skel, dynamicany, svc_utils, utils, iortable { sharedname = TAO_CosTrading_Serv dynamicflags = TAO_TRADING_SERV_BUILD_DLL tagchecks += Trader @@ -123,7 +123,7 @@ project(CosTrading_Serv) : orbsvcslib, install, trading_skel, dynamicany, svc_ut Trader/Constraint_l.cpp: Trader/constraint.l " @echo 'INFORMATION: Potentially outdated $@'" " @echo ' either touch(1) the file or explicitly'" - " @echo ' generate it using:'" + " @echo ' generate it using:'" " @echo ' make -f GNUmakefile.CosTrading_Serv Constraint_l'" .PHONY: Constraint_l @@ -138,14 +138,14 @@ project(CosTrading_Serv) : orbsvcslib, install, trading_skel, dynamicany, svc_ut " -e 's/\\$$Hea''der.*\\$$/$$I''d$$/' \\" " -e 's@#include <stdio\.h>@#include \"ace/os_include/os_stdio.h\"@' \\" " -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\" - " -e '/#include </d' \\" + " -e '/#include </d' \\" " >> Trader/Constraint_l.cpp" " (cd Trader; patch < Constraint_l.cpp.diff)" Trader/Constraint_y.cpp: Trader/constraint.y " @echo 'INFORMATION: Potentially outdated $@'" " @echo ' either touch(1) the file or explicitly'" - " @echo ' generate it using:'" + " @echo ' generate it using:'" " @echo ' make -f GNUmakefile.CosTrading_Serv Constraint_y'" .PHONY: Constraint_y diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc index 992fef36252..437fc4d205d 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(DsEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, event, tao_versioning_idl_defaults { +project(DsEventLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, event, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h @@ -10,7 +10,7 @@ project(DsEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, event, tao_versi } } -project(DsEventLogAdmin) : orbsvcslib, install, dslogadmin, event { +project(DsEventLogAdmin) : orbsvcslib, orbsvcs_output, install, dslogadmin, event { sharedname = TAO_DsEventLogAdmin dynamicflags = TAO_EVENTLOG_BUILD_DLL tagchecks += EventLog @@ -45,7 +45,7 @@ project(DsEventLogAdmin) : orbsvcslib, install, dslogadmin, event { } } -project(DsEventLogAdmin_Skel) : orbsvcslib, install, dseventlogadmin, dslogadmin_skel, event_skel, portableserver { +project(DsEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dseventlogadmin, dslogadmin_skel, event_skel, portableserver { sharedname = TAO_DsEventLogAdmin_Skel dynamicflags = TAO_EVENTLOG_SKEL_BUILD_DLL tagchecks += EventLog @@ -74,7 +74,7 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, install, dseventlogadmin, dslogadmin } } -project(DsEventLogAdmin_Serv) : orbsvcslib, install, dseventlogadmin_skel, dslogadmin_serv, event_serv { +project(DsEventLogAdmin_Serv) : orbsvcslib, orbsvcs_output, install, dseventlogadmin_skel, dslogadmin_serv, event_serv { sharedname = TAO_DsEventLogAdmin_Serv dynamicflags = TAO_EVENTLOG_SERV_BUILD_DLL tagchecks += EventLog diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index 7f66ce8e9ad..4728b366110 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(DsLogAdmin_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { +project(DsLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h @@ -11,7 +11,7 @@ project(DsLogAdmin_IDL) : orbsvcslib, install, tao_versioning_idl_defaults { } } -project(DsLogAdmin) : orbsvcslib, install { +project(DsLogAdmin) : orbsvcslib, orbsvcs_output, install { sharedname = TAO_DsLogAdmin dynamicflags = TAO_LOG_BUILD_DLL tagchecks += Log @@ -38,7 +38,7 @@ project(DsLogAdmin) : orbsvcslib, install { Template_Files { } - + // explicit Resource_Files to avoid including _Skel & _Serv rc files. Resource_Files { DsLogAdmin.rc @@ -50,13 +50,13 @@ project(DsLogAdmin) : orbsvcslib, install { } -project(DsLogAdmin_Skel) : orbsvcslib, install, dslogadmin, portableserver { +project(DsLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dslogadmin, portableserver { sharedname = TAO_DsLogAdmin_Skel dynamicflags = TAO_LOG_SKEL_BUILD_DLL tagchecks += Log IDL_Files { - } + } Source_Files { DsLogAdminS.cpp @@ -83,7 +83,7 @@ project(DsLogAdmin_Skel) : orbsvcslib, install, dslogadmin, portableserver { } -project(DsLogAdmin_Serv) : orbsvcslib, install, dslogadmin_skel, dynamicany, etcl, utils, svc_utils { +project(DsLogAdmin_Serv) : orbsvcslib, orbsvcs_output, install, dslogadmin_skel, dynamicany, etcl, utils, svc_utils { sharedname = TAO_DsLogAdmin_Serv dynamicflags = TAO_LOG_SERV_BUILD_DLL tagchecks += Log diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc index 12102e9bfd9..06ace63e766 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(DsNotifyLogAdmin_IDL) : orbsvcslib, install, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults { +project(DsNotifyLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h @@ -10,7 +10,7 @@ project(DsNotifyLogAdmin_IDL) : orbsvcslib, install, dslogadmin, dseventlogadmin } } -project(DsNotifyLogAdmin) : orbsvcslib, install, dslogadmin, dseventlogadmin, event, notification { +project(DsNotifyLogAdmin) : orbsvcslib, orbsvcs_output, install, dslogadmin, dseventlogadmin, event, notification { sharedname = TAO_DsNotifyLogAdmin dynamicflags = TAO_NOTIFYLOG_BUILD_DLL tagchecks += Log @@ -46,7 +46,7 @@ project(DsNotifyLogAdmin) : orbsvcslib, install, dslogadmin, dseventlogadmin, ev } -project(DsNotifyLogAdmin_Skel) : orbsvcslib, install, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver { +project(DsNotifyLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver { sharedname = TAO_DsNotifyLogAdmin_Skel dynamicflags = TAO_NOTIFYLOG_SKEL_BUILD_DLL tagchecks += Log @@ -65,7 +65,7 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, install, dsnotifylogadmin, dseventl Inline_Files { DsNotifyLogAdminS.inl - } + } Template_Files { } @@ -76,7 +76,7 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, install, dsnotifylogadmin, dseventl } -project(DsNotifyLogAdmin_Serv) : orbsvcslib, install, dsnotifylogadmin_skel, dslogadmin_serv { +project(DsNotifyLogAdmin_Serv) : orbsvcslib, orbsvcs_output, install, dsnotifylogadmin_skel, dslogadmin_serv { sharedname = TAO_DsNotifyLogAdmin_Serv dynamicflags = TAO_NOTIFYLOG_SERV_BUILD_DLL tagchecks += Log diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc index 3925f2dc20a..7e61929abf9 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL.mpc +++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(ETCL) : orbsvcslib, install { +project(ETCL) : orbsvcslib, orbsvcs_output, install { sharedname = TAO_ETCL dynamicflags = TAO_ETCL_BUILD_DLL tagchecks += Notify diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 86b2c625c91..7f9a51ccf6b 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FTORB_Utils) : orbsvcslib, install, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults { +project(FTORB_Utils) : orbsvcslib, orbsvcs_output, install, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults { sharedname = TAO_FTORB_Utils idlflags += -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL @@ -29,7 +29,7 @@ project(FTORB_Utils) : orbsvcslib, install, iormanip, portableserver, portablegr } } -project(FT_ClientORB) : orbsvcslib, ftorbutils, install, messaging, portablegroup, interceptors { +project(FT_ClientORB) : orbsvcslib, orbsvcs_output, ftorbutils, install, messaging, portablegroup, interceptors { avoids += ace_for_tao // Requires ace/UUID sharedname = TAO_FT_ClientORB dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL @@ -61,7 +61,7 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, install, messaging, portablegrou } } -project(FT_ServerORB) : orbsvcslib, ftorbutils, install, messaging, portablegroup, pi_server, pi, interceptors { +project(FT_ServerORB) : orbsvcslib, orbsvcs_output, ftorbutils, install, messaging, portablegroup, pi_server, pi, interceptors { sharedname = TAO_FT_ServerORB dynamicflags = TAO_FT_SERVERORB_BUILD_DLL tagchecks += FT_ServerORB diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index daa3912edbd..3caa45d44b6 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FaultTolerance): orbsvcslib, install, pi, pi_server, notification, ftorb, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults { +project(FaultTolerance): orbsvcslib, orbsvcs_output, install, pi, pi_server, notification, ftorb, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults { sharedname = TAO_FaultTolerance idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index 13af9f27f08..e87c701eba8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (FtRtEvent) : orbsvcslib, install, ftorbutils, rtevent_serv, naming, avoids_minimum_corba, pi_server, tao_versioning_idl_defaults { +project (FtRtEvent) : orbsvcslib, orbsvcs_output, install, ftorbutils, rtevent_serv, naming, avoids_minimum_corba, pi_server, tao_versioning_idl_defaults { sharedname = TAO_FtRtEvent idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h dynamicflags = TAO_FTRTEVENT_BUILD_DLL @@ -36,7 +36,7 @@ project (FtRtEvent) : orbsvcslib, install, ftorbutils, rtevent_serv, naming, avo } } -project (FTRT_ClientORB) : messaging, orbsvcslib, pi, install { +project (FTRT_ClientORB) : messaging, orbsvcslib, orbsvcs_output, pi, install { sharedname = TAO_FTRT_ClientORB dynamicflags = TAO_FTRT_BUILD_DLL tagchecks += FTRT_ClientORB @@ -57,7 +57,7 @@ project (FTRT_ClientORB) : messaging, orbsvcslib, pi, install { } } -project (FTRT_EventChannel) : orbsvcslib, install, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging { +project (FTRT_EventChannel) : orbsvcslib, orbsvcs_output, install, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging { sharedname = TAO_FTRT_EventChannel dynamicflags = TAO_FTRTEC_BUILD_DLL tagchecks += FTRT_EventChannel diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc index 3b4e12273a7..5c9bb83731f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc @@ -2,7 +2,7 @@ // // $Id$ -project : htbp, orbsvcslib, install, tao_versioning_idl_defaults { +project : htbp, orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults { sharedname = TAO_HTIOP idlflags += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS dynamicflags = HTIOP_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index 2c9324c7865..41a6cdd9ac5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(IFRService) : orbsvcslib, install, typecodefactory, svc_utils, iortable { +project(IFRService) : orbsvcslib, orbsvcs_output, install, typecodefactory, svc_utils, iortable { avoids += ace_for_tao // Requires ace/Configuration sharedname = TAO_IFRService dynamicflags = TAO_IFRSERVICE_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 13db06d87ae..0c66896451d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(PortableGroup) : orbsvcslib, install, naming, iormanip, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_versioning_idl_defaults { +project(PortableGroup) : orbsvcslib, orbsvcs_output, install, naming, iormanip, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_versioning_idl_defaults { sharedname = TAO_PortableGroup idlflags += -Wb,export_macro=TAO_PortableGroup_Export \ -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 8c1166bdea2..ca923aaf4c7 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTCORBAEvent) : orbsvcslib, install, rtevent_serv, rtportableserver { +project(RTCORBAEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtportableserver { sharedname = TAO_RTCORBAEvent dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL tagchecks += RTCORBAEvent diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc index 94148b2c927..5245a9a3c04 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTCosScheduling) : orbsvcslib, install, rtportableserver, interceptors, codecfactory, tao_versioning_idl_defaults { +project(RTCosScheduling) : orbsvcslib, orbsvcs_output, install, rtportableserver, interceptors, codecfactory, tao_versioning_idl_defaults { sharedname = TAO_RTCosScheduling idlflags += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 1ca50aee3ce..e3f7a1f764a 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTEvent) : orbsvcslib, install, svc_utils, tao_versioning_idl_defaults { +project(RTEvent) : orbsvcslib, orbsvcs_output, install, svc_utils, tao_versioning_idl_defaults { sharedname = TAO_RTEvent idlflags += -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h dynamicflags = TAO_RTEVENT_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index e53de9dcf45..54dd0f4c76a 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, rtevent, tao_versioning_idl_defaults { +project(RTEventLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, rtevent, tao_versioning_idl_defaults { custom_only = 1 idlflags += -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h @@ -10,7 +10,7 @@ project(RTEventLogAdmin_IDL) : orbsvcslib, install, dslogadmin, rtevent, tao_ver } } -project(RTEventLogAdmin) : orbsvcslib, install, dslogadmin, rtevent { +project(RTEventLogAdmin) : orbsvcslib, orbsvcs_output, install, dslogadmin, rtevent { sharedname = TAO_RTEventLogAdmin dynamicflags = TAO_RTEVENTLOG_BUILD_DLL tagchecks += RTEventLog @@ -44,7 +44,7 @@ project(RTEventLogAdmin) : orbsvcslib, install, dslogadmin, rtevent { } } -project(RTEventLogAdmin_Skel) : orbsvcslib, install, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver { +project(RTEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver { sharedname = TAO_RTEventLogAdmin_Skel dynamicflags = TAO_RTEVENTLOG_SKEL_BUILD_DLL tagchecks += RTEventLog @@ -73,7 +73,7 @@ project(RTEventLogAdmin_Skel) : orbsvcslib, install, rteventlogadmin, dslogadmin } } -project(RTEventLogAdmin_Serv) : orbsvcslib, install, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched { +project(RTEventLogAdmin_Serv) : orbsvcslib, orbsvcs_output, install, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched { sharedname = TAO_RTEventLogAdmin_Serv dynamicflags = TAO_RTEVENTLOG_SERV_BUILD_DLL tagchecks += RTEventLog diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc index 4d7959ca5ff..927b3c02961 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTEvent_Serv) : orbsvcslib, install, rtevent_skel, svc_utils, messaging { +project(RTEvent_Serv) : orbsvcslib, orbsvcs_output, install, rtevent_skel, svc_utils, messaging { avoids += ace_for_tao // Requires ACE_crc32 sharedname = TAO_RTEvent_Serv dynamicflags = TAO_RTEVENT_SERV_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc index 8f1b053b55a..a8bd7f9641f 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTEvent_Skel) : orbsvcslib, install, rtevent, portableserver { +project(RTEvent_Skel) : orbsvcslib, orbsvcs_output, install, rtevent, portableserver { sharedname = TAO_RTEvent_Skel dynamicflags = TAO_RTEVENT_SKEL_BUILD_DLL tagchecks += RTEvent diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc index 0466e207845..e99e51ba846 100644 --- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTKokyuEvent) : orbsvcslib, install, rtevent_serv, rtsched, kokyu { +project(RTKokyuEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtsched, kokyu { sharedname = TAO_RTKokyuEvent dynamicflags = TAO_RTKOKYUEVENT_BUILD_DLL tagchecks += RTKokyuEvent diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index ac57c4acf29..45d660cb3d7 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTSched) : orbsvcslib, install, naming, portableserver, svc_utils, tao_versioning_idl_defaults { +project(RTSched) : orbsvcslib, orbsvcs_output, install, naming, portableserver, svc_utils, tao_versioning_idl_defaults { sharedname = TAO_RTSched idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h dynamicflags = TAO_RTSCHED_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index 0d27ece1fb1..14b7446e2ea 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTSchedEvent) : orbsvcslib, install, rtevent_serv, rtsched { +project(RTSchedEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtsched { sharedname = TAO_RTSchedEvent dynamicflags = TAO_RTSCHEDEVENT_BUILD_DLL tagchecks += RTSchedEvent diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index f3a48ed046a..37fa08a325c 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -1,17 +1,17 @@ // -*- MPC -*- // $Id$ -project(RT_Notification) : orbsvcslib, install, rtcorba, notification_serv, tao_versioning_idl_defaults { +project(RT_Notification) : orbsvcslib, orbsvcs_output, install, rtcorba, notification_serv, tao_versioning_idl_defaults { sharedname = TAO_RT_Notification idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h dynamicflags = TAO_RT_NOTIFY_BUILD_DLL tagchecks += RT_Notify - // The using in the TAO_MC_Default_Factory class is apparently ignored by - // the Borland compiler. I am disabling the virtual function hiding + // The using in the TAO_MC_Default_Factory class is apparently ignored by + // the Borland compiler. I am disabling the virtual function hiding // warning for this project only. specific(borland, bmake) { - compile_flags += -w-hid + compile_flags += -w-hid } IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index 960f5e73c4e..a8495df50d6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(SSLIOP) : orbsvcslib, install, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults, ssliop_params_dup { +project(SSLIOP) : orbsvcslib, orbsvcs_output, install, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults, ssliop_params_dup { sharedname = TAO_SSLIOP idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS dynamicflags = TAO_SSLIOP_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index 49df28927b9..07382107092 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Security) : orbsvcslib, corba_messaging, install, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults { +project(Security) : orbsvcslib, orbsvcs_output, corba_messaging, install, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults { sharedname = TAO_Security idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h dynamicflags = TAO_SECURITY_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index aeb32deef58..8cf909e0f87 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Svc_Utils) : orbsvcslib, install, portableserver, tao_versioning_idl_defaults { +project(Svc_Utils) : orbsvcslib, orbsvcs_output, install, portableserver, tao_versioning_idl_defaults { sharedname = TAO_Svc_Utils idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h dynamicflags = TAO_SVC_UTILS_BUILD_DLL diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc index 5fc8f093ff7..3c4e516aeee 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc @@ -2,6 +2,7 @@ project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc index 11e51c995d0..49c13f1e518 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc @@ -2,6 +2,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib @@ -16,6 +17,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc index a2ddf3694a1..1c52958ac09 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc @@ -12,6 +12,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoid project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib @@ -34,6 +35,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc index e925a259c6e..14c9337a49c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc @@ -11,6 +11,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoid project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib @@ -34,6 +35,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc index 759e87284bf..f19b1d01fae 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc @@ -2,6 +2,7 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib @@ -17,6 +18,7 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_c project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc index 0560c30889f..b53e8618a9c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc @@ -2,6 +2,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib @@ -17,6 +18,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, av project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += RTEC_Perf libs += TAO_RTEC_Perf + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb index 87f5e92c38e..71654bc23c1 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb +++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb @@ -4,6 +4,7 @@ project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iortable { after += CosEvent_Test_Lib libs += CECTests + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl index 7e8af67c676..7d747f6b0a7 100755 --- a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl @@ -11,6 +11,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + $status = 0; $svc_pull_conf = PerlACE::LocalFile ("svc.pull$PerlACE::svcconf_ext"); @@ -24,7 +26,7 @@ sub RunTest ($$$) my $TEST = new PerlACE::Process ($program, $arguments); print STDERR "\n\n$message\n"; - + my $test = $TEST->SpawnWaitKill (240); if ($test != 0) { @@ -40,7 +42,7 @@ RunTest ("\n\nShutdown EC with clients still attached\n", RunTest ("\n\nDisconnect callbacks test\n", "Disconnect", ""); - + RunTest ("\n\nMT Disconnects test\n", "MT_Disconnect", ""); diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb index 63ef09376f3..7060b365b1a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb +++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb @@ -4,6 +4,7 @@ project : messaging, rteventexe, rtevent_serv, naming, iortable { after += Event_Test_Lib libs += ECTests + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl index f739b48fd57..4a9316702d7 100755 --- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl @@ -11,6 +11,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + $status = 0; $svc_conf = PerlACE::LocalFile ("svc$PerlACE::svcconf_ext"); @@ -29,7 +31,7 @@ sub RunTest ($$$) my $TEST = new PerlACE::Process ($program, $arguments); print STDERR "\n\n$message\n"; - + my $test = $TEST->SpawnWaitKill (240); if ($test != 0) { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc index ee053554cb1..d436cd14175 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc @@ -4,6 +4,7 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common @@ -21,6 +22,7 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming { project(*consumer): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common @@ -38,6 +40,7 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming { project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc index ee053554cb1..d436cd14175 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc @@ -4,6 +4,7 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common @@ -21,6 +22,7 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming { project(*consumer): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common @@ -38,6 +40,7 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming { project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc index 48da30505d0..0bbbfeb0eb5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc @@ -4,6 +4,7 @@ project(*application): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common @@ -21,6 +22,7 @@ project(*application): messaging, rteventexe, rtevent_serv, naming { project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests + libpaths += ../Common specific (automake) { includes += $(srcdir)/../Common diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb index 67e95079156..68176e6ef27 100644 --- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb +++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb @@ -4,6 +4,7 @@ project: messaging, rteventexe, rtevent_serv, naming, iortable { after += Event_Test_Lib libs += ECTests + libpaths += ../lib specific (automake) { includes += $(srcdir)/../lib diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl index 6fcee9bdecd..0dd9eacb9b1 100755 --- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl @@ -11,6 +11,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + $status = 0; $ec_st_conf = PerlACE::LocalFile ("ec.st$PerlACE::svcconf_ext"); @@ -24,7 +26,7 @@ sub RunTest ($$$) my $TEST = new PerlACE::Process ($program, $arguments); print STDERR "\n\n$message\n"; - + my $test = $TEST->SpawnWaitKill (60); if ($test != 0) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index 01b39b306f0..b12c7c157ad 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $experiment_timeout = 60; @@ -82,7 +84,7 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service", unlink $namingior; $naming_spawn = $Naming->Spawn (); -if ($naming_spawn != 0) +if ($naming_spawn != 0) { exit 1; } @@ -127,7 +129,7 @@ for $config (@test_configs) ## The MaxQueueLength and MaxEventsPerConsumer are not supported in the Reactive ## configuration, so we skip this test for now. ## The Notification should actually throw an exception for the property not supported. - if ($name->{name} eq "AdminProperties" + if ($name->{name} eq "AdminProperties" && ($config eq "notify.reactive.conf" || $config eq "notify.rt.conf")) { next; @@ -138,7 +140,7 @@ for $config (@test_configs) "-ORBInitRef NameService=file://$namingior " . "$name->{args} "); $test_spawn = $test->Spawn (); - if ($test_spawn != 0) + if ($test_spawn != 0) { break; } @@ -147,7 +149,7 @@ for $config (@test_configs) (defined $name->{extra} ? $name->{extra} : 0)); - if ($status != 0) + if ($status != 0) { print STDERR "ERROR: $name->{name} returned $status\n"; break; diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 6063fd06080..113c5a716d7 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $experiment_timeout = 60; diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index c4fb3f3b737..ac14e907d28 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $ior = PerlACE::LocalFile ("supplier.ior"); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl index b970773c60b..817ba2e9fbe 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -7,6 +7,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; + +PerlACE::add_lib_path ('../lib'); + use strict; PerlACE::check_privilege_group(); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl index 6e0ff849582..8fe67dc2d4e 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -7,6 +7,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; + +PerlACE::add_lib_path ('../lib'); + use strict; PerlACE::check_privilege_group(); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index 954df4092ae..b0fbede2ce2 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $ior = PerlACE::LocalFile ("supplier.ior"); diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index 5d958e69f4e..e7d3453e804 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -7,8 +7,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; + use strict; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); my $ior = PerlACE::LocalFile('test_monitor.ior'); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index 8dfe8cd9804..924c66ca690 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $experiment_timeout = 60; @@ -18,33 +20,33 @@ $naming_ior = PerlACE::LocalFile ("naming.ior"); $supplier_ior = PerlACE::LocalFile ("supplier.ior"); $status = 0; -@tests = +@tests = ( { description => "no threads", - config => "notify_nothreads$PerlACE::svcconf_ext", + config => "notify_nothreads$PerlACE::svcconf_ext", supplier => " -c 10 -e 10 ", consumer => " -c 2 -e 100 ", }, { description => "multi-threaded dispatching", - config => "notify_mtdispatching$PerlACE::svcconf_ext", + config => "notify_mtdispatching$PerlACE::svcconf_ext", supplier => " -c 10 -e 10 ", consumer => " -c 2 -e 100 ", }, { description => "multi-threaded supplier-side", - config => "notify_mtsource$PerlACE::svcconf_ext", + config => "notify_mtsource$PerlACE::svcconf_ext", supplier => " -c 10 -e 10 ", consumer => " -c 2 -e 100 ", }, ); -@tests2 = +@tests2 = ( { description => "multi-threaded dispatching", - config => "notify_mtdispatching$PerlACE::svcconf_ext", + config => "notify_mtdispatching$PerlACE::svcconf_ext", supplier => " ", consumer => " ", } @@ -81,20 +83,20 @@ for $test (@tests) $args = $Notification->Arguments (); print STDERR "Running Notification with arguments: $args\n"; $Notification->Spawn (); - + if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; $Notification->Kill (); $Naming->Kill (); exit 1; } - + unlink $supplier_ior; $Supplier->Arguments ($Supplier->Arguments () . $test->{supplier}); $args = $Supplier->Arguments (); print STDERR "Running Supplier with arguments: $args\n"; $Supplier->Spawn (); - + if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the supplier to start\n"; $Supplier->Kill (); @@ -102,12 +104,12 @@ for $test (@tests) $Naming->Kill (); exit 1; } - + $Consumer->Arguments ($Consumer->Arguments () . $test->{consumer}); $args = $Consumer->Arguments (); print STDERR "Running Consumer with arguments: $args\n"; $status = $Consumer->SpawnWaitKill ($experiment_timeout); - if ($status != 0) + if ($status != 0) { print STDERR "ERROR: Consumer returned $status\n"; $Supplier->Kill (); @@ -127,7 +129,7 @@ for $test (@tests) $Notification->Kill (); unlink $notify_ior; } - + $Naming->Kill (); unlink $naming_ior; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index 197ff4fe1da..6a50697c589 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $ior = PerlACE::LocalFile ("supplier.ior"); @@ -48,10 +50,10 @@ $SEC = new PerlACE::Process ("Sequence_Consumer"); $client_args = "-ORBInitRef NameService=iioploc://localhost:" . "$port/NameService"; - + unlink $notifyior; unlink $naming_ior; - + $NS->Spawn (); if (PerlACE::waitforfile_timed ($naming_ior, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: waiting for the naming service to start\n"; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl index b57f87cc683..09557218992 100755 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl @@ -14,6 +14,8 @@ use strict; use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + # ****************************************************************** # Data Section # ****************************************************************** diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index 57aa1a93845..bc4181672dd 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $ior = PerlACE::LocalFile ("supplier.ior"); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index d28b91cd4d4..c1a2343fb40 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); $ior = PerlACE::LocalFile ("supplier.ior"); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index f78f41a000e..95b843786f1 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -10,6 +10,8 @@ use strict; use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); my $ior = PerlACE::LocalFile ("supplier.ior"); @@ -64,7 +66,7 @@ if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creati $NS->Kill (); exit 1; } - + $STC->Arguments($args); my $client = $STC->SpawnWaitKill(20); if ($client != 0) { @@ -93,7 +95,7 @@ if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creati $NS->Kill (); exit 1; } - + $STC->Arguments("-f $args"); my $client = $STC->SpawnWaitKill(20); if ($client != 0) { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl index d1fe3ff5fc6..c5c466a501f 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -10,6 +10,8 @@ use strict; use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + PerlACE::check_privilege_group(); my $ior = PerlACE::LocalFile ("supplier.ior"); @@ -73,7 +75,7 @@ foreach my $supplier_op (@ops) } print "\n**** Testing with $consumer_args ****\n"; - + $STS->Arguments($supplier_args . $args); $STS->Spawn (); if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creation) == -1) { @@ -82,7 +84,7 @@ foreach my $supplier_op (@ops) $status = 1; last; } - + $STC->Arguments($consumer_args . $args); my $client = $STC->SpawnWaitKill(20); if ($client != 0) { @@ -103,7 +105,7 @@ foreach my $supplier_op (@ops) last; } } - + $TS->Kill (); $NS->Kill (); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index d934fc10b02..00675644772 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../../lib'); + PerlACE::check_privilege_group(); $ior = PerlACE::LocalFile ("supplier.ior"); @@ -41,7 +43,7 @@ unlink $namingior; $client_args = "-ORBInitRef NameService=iioploc://localhost:" . "$port/NameService"; - + $NS->Spawn (); if (PerlACE::waitforfile_timed ($namingior, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: waiting for the naming service to start\n"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl index 32373abd1c8..466371b6e71 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../../lib'); + PerlACE::check_privilege_group(); $experiment_timeout = 60; @@ -34,7 +36,7 @@ $test = new PerlACE::Process ("RedGreen_Test", $Naming->Spawn (); -if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) +if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the naming service to start\n"; $Naming->Kill (); @@ -45,7 +47,7 @@ for $config (@test_configs) { print STDERR "\nTesting Notification Service with config file = $config ....\n\n"; - $Notification = + $Notification = new PerlACE::Process ("../../../../Notify_Service/Notify_Service", "-ORBInitRef NameService=file://$namingior " . "-IORoutput $notifyior " . diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/run_test.pl b/TAO/performance-tests/CSD_Strategy/TestApps/run_test.pl index 86173bd7595..355acf1f2f4 100755 --- a/TAO/performance-tests/CSD_Strategy/TestApps/run_test.pl +++ b/TAO/performance-tests/CSD_Strategy/TestApps/run_test.pl @@ -8,6 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ( '../TestInf'); +PerlACE::add_lib_path ( '../TestServant'); + # 5 Minute server timeout. my $server_timeout_secs = 300; diff --git a/TAO/tao/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode.mpc index 7702beabd84..08e98ea43a6 100644 --- a/TAO/tao/AnyTypeCode.mpc +++ b/TAO/tao/AnyTypeCode.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory, gen_ostream { +project : taolib, tao_output, install, extra_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory, gen_ostream { sharedname = TAO_AnyTypeCode dynamicflags = TAO_ANYTYPECODE_BUILD_DLL diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc index 6da01a49cfa..e5481cdcc1a 100644 --- a/TAO/tao/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, pi, tao_versioning_idl_defaults { +project : taolib, tao_output, install, pi, tao_versioning_idl_defaults { sharedname = TAO_BiDirGIOP dynamicflags = TAO_BIDIRGIOP_BUILD_DLL diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index 6f37d0bd707..8a6e11ac3d4 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -28,6 +28,7 @@ TAO_BiDirGIOP_Loader::init (int, ACE_TCHAR* []) { if (TAO_BiDirGIOP_Loader::is_activated_ == false && TAO_DEF_GIOP_MINOR >= 2) { + ACE_DEBUG ((LM_DEBUG, "Activating BiDirectional GIOP\n")); PortableInterceptor::ORBInitializer_ptr tmp_orb_initializer = PortableInterceptor::ORBInitializer::_nil (); PortableInterceptor::ORBInitializer_var bidir_orb_initializer; diff --git a/TAO/tao/CSD_Framework.mpc b/TAO/tao/CSD_Framework.mpc index 7e115a9de7b..67fd954fa1f 100644 --- a/TAO/tao/CSD_Framework.mpc +++ b/TAO/tao/CSD_Framework.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, portableserver, install, pi, avoids_corba_e_micro, tao_versioning_idl_defaults { +project : taolib, tao_output, portableserver, install, pi, avoids_corba_e_micro, tao_versioning_idl_defaults { sharedname = TAO_CSD_Framework dynamicflags = TAO_CSD_FW_BUILD_DLL includes += $(TAO_ROOT)/tao diff --git a/TAO/tao/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool.mpc index 4cdd69e86e2..3b718d679f6 100644 --- a/TAO/tao/CSD_ThreadPool.mpc +++ b/TAO/tao/CSD_ThreadPool.mpc @@ -1,5 +1,5 @@ //$Id$ -project : csd_framework, install, threads { +project : csd_framework, tao_output, install, threads { sharedname = TAO_CSD_ThreadPool dynamicflags = TAO_CSD_TP_BUILD_DLL includes += $(TAO_ROOT)/tao diff --git a/TAO/tao/CodecFactory.mpc b/TAO/tao/CodecFactory.mpc index 1fe578a00b8..7b42e5fea09 100644 --- a/TAO/tao/CodecFactory.mpc +++ b/TAO/tao/CodecFactory.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, core_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory { +project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory { sharedname = TAO_CodecFactory dynamicflags = TAO_CODECFACTORY_BUILD_DLL diff --git a/TAO/tao/Codeset.mpc b/TAO/tao/Codeset.mpc index 68f1987fa41..458a1590684 100644 --- a/TAO/tao/Codeset.mpc +++ b/TAO/tao/Codeset.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, install, tao_versioning_idl_defaults, nolink_codecfactory { +project : taolib, tao_output, install, tao_versioning_idl_defaults, nolink_codecfactory { sharedname = TAO_Codeset dynamicflags = TAO_CODESET_BUILD_DLL pch_header = diff --git a/TAO/tao/Compression.mpc b/TAO/tao/Compression.mpc index f1242c80dd8..5dccc7028c0 100644 --- a/TAO/tao/Compression.mpc +++ b/TAO/tao/Compression.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, tao_versioning_idl_defaults { +project : taolib, tao_output, install, tao_versioning_idl_defaults { sharedname = TAO_Compression dynamicflags = TAO_COMPRESSION_BUILD_DLL diff --git a/TAO/tao/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy.mpc index c709cb37d45..27d1f70e896 100644 --- a/TAO/tao/DiffServPolicy.mpc +++ b/TAO/tao/DiffServPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project : taolib, tao_output, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { sharedname = TAO_DiffServPolicy dynamicflags = TAO_DIFFSERVPOLICY_BUILD_DLL diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc index a179007b978..700e4217968 100644 --- a/TAO/tao/DynamicAny.mpc +++ b/TAO/tao/DynamicAny.mpc @@ -1,6 +1,6 @@ //$Id$ -project : install, valuetype, tao_versioning_idl_defaults { +project : install, tao_output, valuetype, tao_versioning_idl_defaults { sharedname = TAO_DynamicAny dynamicflags = TAO_DYNAMICANY_BUILD_DLL diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc index 0225830fbdf..ce502d748a9 100644 --- a/TAO/tao/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, messaging, core_minimum_corba { +project : taolib, tao_output, install, messaging, core_minimum_corba { sharedname = TAO_DynamicInterface dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc index 3d349a9db22..59c0494ed97 100644 --- a/TAO/tao/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project : taolib, tao_output, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { sharedname = TAO_EndpointPolicy dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc index 81eae8994fa..ef637d87d3f 100644 --- a/TAO/tao/IFR_Client.mpc +++ b/TAO/tao/IFR_Client.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, core_anytypecode, tao_versioning_idl_defaults { +project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_IFR_Client dynamicflags = TAO_IFR_CLIENT_BUILD_DLL diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc index e086d8a455f..f6ce074aa01 100644 --- a/TAO/tao/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, portableserver, objreftemplate, pi, install, tao_versioning_idl_defaults { +project : taolib, tao_output, portableserver, objreftemplate, pi, install, tao_versioning_idl_defaults { sharedname = TAO_IORInterceptor dynamicflags = TAO_IORINTERCEPTOR_BUILD_DLL diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc index 5bd3e7dcb32..a9d0628b0c8 100644 --- a/TAO/tao/IORManipulation.mpc +++ b/TAO/tao/IORManipulation.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, install, core_anytypecode, tao_versioning_idl_defaults { +project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_IORManip dynamicflags = TAO_IORMANIP_BUILD_DLL diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc index d79b2c364fd..c456c99db0a 100644 --- a/TAO/tao/IORTable.mpc +++ b/TAO/tao/IORTable.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, install, tao_versioning_idl_defaults { +project : taolib, tao_output, install, tao_versioning_idl_defaults { sharedname = TAO_IORTable dynamicflags = TAO_IORTABLE_BUILD_DLL diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc index 786c3171610..a000f2efafc 100644 --- a/TAO/tao/ImR_Client.mpc +++ b/TAO/tao/ImR_Client.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, portableserver, tao_versioning_idl_defaults { +project : taolib, tao_output, install, portableserver, tao_versioning_idl_defaults { sharedname = TAO_ImR_Client dynamicflags = TAO_IMR_CLIENT_BUILD_DLL diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc index d6540f7544c..5c746bcc979 100644 --- a/TAO/tao/Messaging.mpc +++ b/TAO/tao/Messaging.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, portableserver, pi, valuetype, tao_versioning_idl_defaults { +project : taolib, tao_output, install, portableserver, pi, valuetype, tao_versioning_idl_defaults { sharedname = TAO_Messaging dynamicflags = TAO_MESSAGING_BUILD_DLL diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc index 7d294acbccb..492237ab5a2 100644 --- a/TAO/tao/ObjRefTemplate.mpc +++ b/TAO/tao/ObjRefTemplate.mpc @@ -1,5 +1,5 @@ //$Id$ -project : valuetype, portableserver, install, tao_versioning_idl_defaults { +project : valuetype, portableserver, install, tao_output, tao_versioning_idl_defaults { sharedname = TAO_ObjRefTemplate dynamicflags = TAO_ORT_BUILD_DLL diff --git a/TAO/tao/PI.mpc b/TAO/tao/PI.mpc index 9474f20a310..d686c1cd86a 100644 --- a/TAO/tao/PI.mpc +++ b/TAO/tao/PI.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, codecfactory, install, tao_versioning_idl_defaults { +project : taolib, tao_output, codecfactory, install, tao_versioning_idl_defaults { sharedname = TAO_PI dynamicflags = TAO_PI_BUILD_DLL idlflags += -SS -Sci -Gp -Gd \ diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server.mpc index 1cf004d4f98..170598750a0 100644 --- a/TAO/tao/PI_Server.mpc +++ b/TAO/tao/PI_Server.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, pi, portableserver, install, tao_versioning_idl_defaults { +project : taolib, tao_output, pi, portableserver, install, tao_versioning_idl_defaults { sharedname = TAO_PI_Server dynamicflags = TAO_PI_SERVER_BUILD_DLL diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc index 46f35f6cb0c..a5d9f0d1563 100644 --- a/TAO/tao/PortableServer.mpc +++ b/TAO/tao/PortableServer.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, core_anytypecode, tao_versioning_idl_defaults { +project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_PortableServer dynamicflags = TAO_PORTABLESERVER_BUILD_DLL diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc index f858df23ea8..95a933df552 100644 --- a/TAO/tao/RTCORBA.mpc +++ b/TAO/tao/RTCORBA.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, pi, tao_versioning_idl_defaults { +project : taolib, tao_output, install, pi, tao_versioning_idl_defaults { sharedname = TAO_RTCORBA dynamicflags = TAO_RTCORBA_BUILD_DLL requires += rt_corba diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc index 4c665a34c85..c843076ebc7 100644 --- a/TAO/tao/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, rtcorba, portableserver, avoids_corba_e_micro { +project : taolib, tao_output, install, rtcorba, portableserver, avoids_corba_e_micro { sharedname = TAO_RTPortableServer dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc index 63937599a3c..2eb46a1bb14 100644 --- a/TAO/tao/RTScheduler.mpc +++ b/TAO/tao/RTScheduler.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, rtcorba, pi, pi_server, portableserver, install, corba_messaging, tao_versioning_idl_defaults, avoids_corba_e_micro { +project : taolib, tao_output, rtcorba, pi, pi_server, portableserver, install, corba_messaging, tao_versioning_idl_defaults, avoids_corba_e_micro { sharedname = TAO_RTScheduler dynamicflags = TAO_RTSCHEDULER_BUILD_DLL diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc index 9077d3b3672..839bc01eea9 100644 --- a/TAO/tao/SmartProxies.mpc +++ b/TAO/tao/SmartProxies.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, tao_versioning_idl_defaults { +project : taolib, tao_output, install, tao_versioning_idl_defaults { sharedname = TAO_SmartProxies dynamicflags = TAO_SMARTPROXIES_BUILD_DLL diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index 76f08d1943d..67a9e32bb6d 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, install, pi, core_anytypecode, core_strategies, tao_versioning_idl_defaults { +project : taolib, tao_output, install, pi, core_anytypecode, core_strategies, tao_versioning_idl_defaults { sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL diff --git a/TAO/tao/TC.mpc b/TAO/tao/TC.mpc index 6bed615c2c1..c13bc55aea7 100644 --- a/TAO/tao/TC.mpc +++ b/TAO/tao/TC.mpc @@ -1,6 +1,6 @@ //$Id$ -project(*) : taolib_with_idl, tao_versioning_idl_defaults, install, interceptors, pi { +project(*) : taolib_with_idl, tao_output, tao_versioning_idl_defaults, install, interceptors, pi { requires += transport_current sharedname = TAO_TC diff --git a/TAO/tao/TC_IIOP.mpc b/TAO/tao/TC_IIOP.mpc index db143dcfdf4..e5b38890b14 100644 --- a/TAO/tao/TC_IIOP.mpc +++ b/TAO/tao/TC_IIOP.mpc @@ -1,6 +1,6 @@ //$Id$ -project(*) : taolib_with_idl, tao_versioning_idl_defaults, install, tc, interceptors, pi { +project(*) : taolib_with_idl, tao_output, tao_versioning_idl_defaults, install, tc, interceptors, pi { requires += transport_current sharedname = TAO_TC_IIOP diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc index 96bfb2cfb71..8c54a8e4b57 100644 --- a/TAO/tao/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, ifr_client, tao_versioning_idl_defaults { +project : taolib, tao_output, install, ifr_client, tao_versioning_idl_defaults { sharedname = TAO_TypeCodeFactory dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc index 265c6762bde..885ed78713a 100644 --- a/TAO/tao/Utils.mpc +++ b/TAO/tao/Utils.mpc @@ -1,5 +1,5 @@ // $Id$ -project (TAO_Utils) : taolib, install, portableserver, pi { +project (TAO_Utils) : taolib, tao_output, install, portableserver, pi { sharedname = TAO_Utils dynamicflags = TAO_UTILS_BUILD_DLL diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc index 97b3467d2f2..1dd1225136c 100644 --- a/TAO/tao/Valuetype.mpc +++ b/TAO/tao/Valuetype.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, core_anytypecode, avoids_corba_e_micro, tao_versioning_idl_defaults, gen_ostream { +project : taolib, tao_output, install, core_anytypecode, avoids_corba_e_micro, tao_versioning_idl_defaults, gen_ostream { sharedname = TAO_Valuetype dynamicflags = TAO_VALUETYPE_BUILD_DLL diff --git a/TAO/tao/ZlibCompressor.mpc b/TAO/tao/ZlibCompressor.mpc index 25f0400daac..dda8e12f6e7 100644 --- a/TAO/tao/ZlibCompressor.mpc +++ b/TAO/tao/ZlibCompressor.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, install, compression, tao_versioning_idl_defaults, zlib { +project : taolib, tao_output, install, compression, tao_versioning_idl_defaults, zlib { requires += zlib sharedname = TAO_ZlibCompressor dynamicflags = TAO_ZLIBCOMPRESSOR_BUILD_DLL diff --git a/TAO/tests/BiDirectional/run_test.pl b/TAO/tests/BiDirectional/run_test.pl index a424f9052a4..f9660b20229 100755 --- a/TAO/tests/BiDirectional/run_test.pl +++ b/TAO/tests/BiDirectional/run_test.pl @@ -18,7 +18,7 @@ if (PerlACE::is_vxworks_test()) { $SV = new PerlACE::ProcessVX ("server", "-o $iorbase -i 100"); } else { - $SV = new PerlACE::Process ("server", "-o $iorfile -i 100"); + $SV = new PerlACE::Process ("server", "-o $iorfile -i 100 -ORBDebugLevel 10"); } $CL = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl index ab801eddf1f..059abd15ca2 100755 --- a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl +++ b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl @@ -32,6 +32,11 @@ local $start_time = time(); local $max_running_time = 300; # 5 minutes local $elapsed = time() - $start_time; +if ($ARGV[0] eq '-quick') { + $elapsed = 0; + $max_running_time = 1; +} + print STDERR "elaped is $elapsed\n"; while($elapsed < $max_running_time) { print STDERR "**************************** \n"; diff --git a/TAO/tests/Bug_1020_Regression/run_test.pl b/TAO/tests/Bug_1020_Regression/run_test.pl index 2bb06a287a3..a5f22b09154 100755 --- a/TAO/tests/Bug_1020_Regression/run_test.pl +++ b/TAO/tests/Bug_1020_Regression/run_test.pl @@ -23,7 +23,7 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); @@ -34,6 +34,11 @@ local $start_time = time(); local $max_running_time = 300; # 5 minutes local $elapsed = time() - $start_time; +if ($ARGV[0] eq '-quick') { + $elapsed = 0; + $max_running_time = 1; +} + while($elapsed < $max_running_time) { # Start all clients in parallel $client1 = $CL1->Spawn (); diff --git a/TAO/tests/Bug_1269_Regression/run_test.pl b/TAO/tests/Bug_1269_Regression/run_test.pl index ec9477102b4..6118ec2af8c 100755 --- a/TAO/tests/Bug_1269_Regression/run_test.pl +++ b/TAO/tests/Bug_1269_Regression/run_test.pl @@ -23,7 +23,7 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); @@ -34,6 +34,11 @@ local $start_time = time(); local $max_running_time = 240; # 4 minutes local $elapsed = time() - $start_time; +if ($ARGV[0] eq '-quick') { + $elapsed = 0; + $max_running_time = 1; +} + while($elapsed < $max_running_time) { # Start all clients in parallel $client1 = $CL1->Spawn (); diff --git a/TAO/tests/Bug_1270_Regression/run_test.pl b/TAO/tests/Bug_1270_Regression/run_test.pl index e6f12f03ee0..4f075e80a29 100755 --- a/TAO/tests/Bug_1270_Regression/run_test.pl +++ b/TAO/tests/Bug_1270_Regression/run_test.pl @@ -23,7 +23,7 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); @@ -34,6 +34,11 @@ local $start_time = time(); local $max_running_time = 240; # 4 minutes local $elapsed = time() - $start_time; +if ($ARGV[0] eq '-quick') { + $elapsed = 0; + $max_running_time = 1; +} + while($elapsed < $max_running_time) { # Start all clients in parallel $client1 = $CL1->Spawn (); diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl index b77fb73e0b7..b0fc78cea19 100755 --- a/TAO/tests/Bug_1361_Regression/run_test.pl +++ b/TAO/tests/Bug_1361_Regression/run_test.pl @@ -36,6 +36,11 @@ local $max_running_time = 360; local $elapsed = time() - $start_time; my $p = $SV->{'PROCESS'}; +if ($ARGV[0] eq '-quick') { + $elapsed = 0; + $max_running_time = 1; +} + while (($elapsed < $max_running_time) ) { # Start all clients in parallel diff --git a/TAO/tests/Bug_1482_Regression/run_test.pl b/TAO/tests/Bug_1482_Regression/run_test.pl index 364fb54817c..871726389ff 100755 --- a/TAO/tests/Bug_1482_Regression/run_test.pl +++ b/TAO/tests/Bug_1482_Regression/run_test.pl @@ -25,6 +25,11 @@ local $start_time = time(); local $max_running_time = 600; # 5 minutes local $elapsed = time() - $start_time; +if ($ARGV[0] eq '-quick') { + $elapsed = 0; + $max_running_time = 1; +} + while($elapsed < $max_running_time) { print STDERR " Going .. \n"; diff --git a/TAO/tests/Bug_1551_Regression/run_test.pl b/TAO/tests/Bug_1551_Regression/run_test.pl index e5a0aec36bc..2fa0f4d68d9 100755 --- a/TAO/tests/Bug_1551_Regression/run_test.pl +++ b/TAO/tests/Bug_1551_Regression/run_test.pl @@ -27,6 +27,11 @@ local $max_running_time = 600; # 10 minutes local $elapsed = time() - $start_time; local $ntimes = 50 ; # run test for 50 times + +if ($ARGV[0] eq '-quick') { + $ntimes = 1; +} + local $n = 0; while($n < $ntimes) { diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl b/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl index 399443c5b71..c0af92a175e 100755 --- a/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -106,7 +111,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", # "-ORBNegotiateCodesets 0 " . "-p $iorfname_prefix " . "-s $num_servants " . @@ -117,7 +122,7 @@ if (PerlACE::is_vxworks_test()) { "-k $collocated_client_kind"); } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", # "-ORBNegotiateCodesets 0 " . "-p $iorfname_prefix " . "-s $num_servants " . diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl index 120e983cff2..38d2117126f 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl @@ -8,6 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + $baseior = "server.ior"; $iorfile = PerlACE::LocalFile ("$baseior"); unlink $iorfile; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl index 7da2894591d..7094eb43bc7 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -105,7 +110,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -115,7 +120,7 @@ if (PerlACE::is_vxworks_test()) { "-k $collocated_client_kind"); } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -146,11 +151,11 @@ my $count = 0; for ($i = 0; $i < $num_remote_clients; $i++) { - + $client_id = $i+1; $j = $i % $num_servants; - + $CLS[$i] = new PerlACE::Process("client_main", "-i file://$iorfile[$j] ". "-k $client_kind ". diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl index 11e3ef02dd6..18860b82c92 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -106,7 +111,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -116,7 +121,7 @@ if (PerlACE::is_vxworks_test()) { "-k $collocated_client_kind"); } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -155,7 +160,7 @@ for ($i = 0; $i < $num_remote_clients; $i++) "-k $client_kind ". "-n $client_id"); # print STDERR $CLS[$i]->CommandLine() . "\n"; - + $CLS[$i]->Spawn(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl index be5769d3558..400c8228402 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + my $status = 0; my $iorfname_prefix = "servant"; @@ -111,7 +116,7 @@ for ($i = 0; $i < $num_servants; $i++) { } if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server_main", + $SV = new PerlACE::ProcessVX ("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -122,7 +127,7 @@ if (PerlACE::is_vxworks_test()) { } else { - $SV = new PerlACE::Process("server_main", + $SV = new PerlACE::Process("server_main", "-p $iorfname_prefix " . "-s $num_servants " . "-n $num_csd_threads " . @@ -151,11 +156,11 @@ my $count = 0; for ($i = 0; $i < $num_remote_clients; $i++) { - + $client_id = $i+1; $j = $i % $num_servants; - + $CLS[$i] = new PerlACE::Process("client_main", "-i file://$iorfile[$j] ". "-k $client_kind ". diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl index fee5bc7bc29..84e58ce81b0 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + $status = 0; $iorfile = PerlACE::LocalFile ("server.ior"); @@ -20,7 +25,7 @@ else { $SV = new PerlACE::Process ("server", "-o $iorfile"); } $CL = new PerlACE::Process ("client", " -k file://$iorfile"); - + $SV->Spawn (); if (PerlACE::waitforfile_timed ($iorfile, @@ -28,7 +33,7 @@ if (PerlACE::waitforfile_timed ($iorfile, print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $client = $CL->SpawnWaitKill (300); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl index 908cfa341f9..19a0b761811 100755 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl @@ -8,6 +8,11 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../TP_Foo_A/.'); +PerlACE::add_lib_path ('../TP_Foo_B/.'); +PerlACE::add_lib_path ('../TP_Foo_C/.'); +PerlACE::add_lib_path ('../TP_Common/.'); + $iorfilebase = "server.ior"; $iorfile = PerlACE::LocalFile ("$iorfilebase"); unlink $iorfile; diff --git a/TAO/tests/Collocation/run_test.pl b/TAO/tests/Collocation/run_test.pl index 098e1b266cc..a7faa8847fe 100755 --- a/TAO/tests/Collocation/run_test.pl +++ b/TAO/tests/Collocation/run_test.pl @@ -9,6 +9,8 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; use PerlACE::TestTarget; +PerlACE::add_lib_path ('.'); + my $target = PerlACE::TestTarget::create_target ($PerlACE::TestConfig); $status = 0; diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp index a69422b0a47..bbbae0fa4d9 100644 --- a/TAO/tests/Crash_On_Write/client.cpp +++ b/TAO/tests/Crash_On_Write/client.cpp @@ -93,6 +93,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "Finished iteration %d\n", i)); + + // Lets not waste any more time than we have to + if (exception_count > 10 && normal_count > 0) + break; } if (exception_count == 0) diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index 25ee15059f6..0e32e29fc26 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager->activate (); // Create a separate thread to crash the server. - Crash_Task crash_task (ACE_Thread_Manager::instance (), ACE_Time_Value(20)); + Crash_Task crash_task (ACE_Thread_Manager::instance (), ACE_Time_Value(10)); if (crash_task.activate () == -1) { diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp index 04fb261c1b2..60de5a6d5d6 100644 --- a/TAO/tests/Crashed_Callback/Service.cpp +++ b/TAO/tests/Crashed_Callback/Service.cpp @@ -6,7 +6,8 @@ ACE_RCSID(Crashed_Callback, Service, "$Id$") Service::Service (void) - : test_count_ (0) + : orb_ (CORBA::ORB::_nil ()), + test_count_ (0) { } @@ -56,6 +57,7 @@ Service::run_test (Test::Crashed_Callback_ptr callback) ACE_DEBUG ((LM_DEBUG, "Good!! %d exceptions raised after crash\n", pos_crash_exceptions)); + orb_->shutdown (false); } /// Increment the number of tests completed diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index 99d430525f1..72a4d318518 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -25,6 +25,8 @@ public: // = The skeleton methods virtual void run_test (Test::Crashed_Callback_ptr callback); + CORBA::ORB_var orb_; + private: /// Call the are_you_there callback multiple times. /** @@ -41,6 +43,7 @@ private: private: /// Count the number of tests executed int test_count_; + }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index c4ae2e38f3b..790ab7c4ba2 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -91,6 +91,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) 1); PortableServer::ServantBase_var owner_transfer(service_impl); + service_impl->orb_ = CORBA::ORB::_duplicate (orb); + PortableServer::ObjectId_var id = root_poa->activate_object (service_impl); diff --git a/TAO/tests/Nested_Upcall_Crash/run_test.pl b/TAO/tests/Nested_Upcall_Crash/run_test.pl index 989ed322313..9016c5b9288 100755 --- a/TAO/tests/Nested_Upcall_Crash/run_test.pl +++ b/TAO/tests/Nested_Upcall_Crash/run_test.pl @@ -39,6 +39,11 @@ local $start_time = time(); local $max_running_time = 600; # 10 minutes local $elapsed = time() - $start_time; +if ($ARGV[0] eq '-quick') { + $elapsed = 0; + $max_running_time = 1; +} + while($elapsed < $max_running_time) { # Start all clients in parallel $client1 = $CL1->Spawn (); diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp index 354b30c8bc6..f82bb6483f5 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp @@ -3,15 +3,18 @@ // #include "Client_Task.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Muxing, Client_Task, "$Id$") Client_Task::Client_Task (Test::Sender_ptr reply_gen, Test::Receiver_ptr us, - ACE_Thread_Manager *thr_mgr) + ACE_Thread_Manager *thr_mgr, + Receiver_i * receiver_impl) : ACE_Task_Base (thr_mgr) , sender_(Test::Sender::_duplicate (reply_gen)) , us_ (Test::Receiver::_duplicate (us)) + , receiver_impl_ (receiver_impl) { } @@ -30,6 +33,14 @@ Client_Task::svc (void) this->sender_->send_ready_message (this->us_.in ()); } + + // sleeps are evil but 1 sec or so is an improvement on the minute plus + // this poorly implemented test used to take + while (this->receiver_impl_->no_calls_ < 10) + ACE_OS::sleep (1); + this->sender_->shutdown (); + + this->us_->shutdown (); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h index 5e5570ba10d..4fca46e6fde 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h @@ -7,6 +7,7 @@ #include /**/ "ace/pre.h" #include "TestC.h" +#include "Receiver_i.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -20,7 +21,8 @@ public: /// Constructor Client_Task (Test::Sender_ptr sender, Test::Receiver_ptr us, - ACE_Thread_Manager *thr_mgr); + ACE_Thread_Manager *thr_mgr, + Receiver_i * receiver_impl); /// Thread entry point int svc (void); @@ -32,6 +34,8 @@ private: /// Reference to the test interface Test::Receiver_var us_; + + Receiver_i* receiver_impl_; }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index 4ece8c08df7..14c19f52bc4 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -5,10 +5,10 @@ ACE_RCSID(Oneways_Invoking_Twoways, Receiver_i, "$Id$") Receiver_i::Receiver_i (CORBA::ORB_ptr orb, Test::Sender_ptr sender, CORBA::ULong iter) - : orb_ (CORBA::ORB::_duplicate (orb)), + : no_calls_ (0), + orb_ (CORBA::ORB::_duplicate (orb)), sender_ (Test::Sender::_duplicate (sender)), - iteration_ (iter), - no_calls_ (0) + iteration_ (iter) { } @@ -34,3 +34,11 @@ Receiver_i::get_call_count ( /**/) { return this->iteration_; } + +void +Receiver_i::shutdown (void) +{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) About to invoke shudown... \n")); + this->orb_->shutdown (0); +} diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 2878f61b637..0bc261615ea 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -38,6 +38,11 @@ public: /// Retun the number of calls that every thread would make... virtual CORBA::Long get_call_count (void); + virtual void shutdown (void); + + /// Number of calls processed so far.. + CORBA::ULong no_calls_; + private: /// Our Orb... CORBA::ORB_var orb_; @@ -47,9 +52,6 @@ private: /// Number of invocations to be made on the sender.. CORBA::ULong iteration_; - - /// Number of calls processed so far.. - CORBA::ULong no_calls_; }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index ae50a6b64eb..54a39be83e6 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -45,3 +45,11 @@ Sender_i::ping ( /**/) { return; } + +void +Sender_i::shutdown (void) +{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) About to invoke shudown... \n")); + this->orb_->shutdown (0); +} diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 8bb227053e8..ab267b02277 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -39,6 +39,8 @@ public: virtual void ping (void); + virtual void shutdown (void); + private: /// Our local ORB ptr CORBA::ORB_ptr orb_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Test.idl b/TAO/tests/Oneways_Invoking_Twoways/Test.idl index 9e23b7b2c9e..6eeeda5d336 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Test.idl +++ b/TAO/tests/Oneways_Invoking_Twoways/Test.idl @@ -12,6 +12,7 @@ module Test /// Get the number of calls that every thread would make... long get_call_count (); + oneway void shutdown (); }; interface Sender { @@ -24,5 +25,7 @@ module Test /// Send a ready message oneway void send_ready_message (in Receiver callback); + + oneway void shutdown (); }; }; diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index 18aa4d484dd..533f02cc6fb 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -96,7 +96,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Client_Task client_task (sender.in (), receiver.in (), - ACE_Thread_Manager::instance ()); + ACE_Thread_Manager::instance (), + receiver_impl); Server_Task server_task (orb.in (), ACE_Thread_Manager::instance ()); diff --git a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc index eeb6bebec4e..479372c0c70 100644 --- a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc +++ b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid includes += $(srcdir)/../Generic_Servant } includes += ../Generic_Servant + libpaths += ../Generic_Servant Source_Files { server.cpp diff --git a/TAO/tests/POA/Adapter_Activator/run_test.pl b/TAO/tests/POA/Adapter_Activator/run_test.pl index 9eedbf90455..9d8109d0b23 100755 --- a/TAO/tests/POA/Adapter_Activator/run_test.pl +++ b/TAO/tests/POA/Adapter_Activator/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../Generic_Servant/.'); + $iorbase = "ior"; $iorfile = PerlACE::LocalFile ("$iorbase"); diff --git a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc index fe7397b61cf..15312a0bfe1 100644 --- a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc +++ b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid includes += $(srcdir)/../Generic_Servant } includes += ../Generic_Servant + libpaths += ../Generic_Servant Source_Files { server.cpp diff --git a/TAO/tests/POA/Explicit_Activation/run_test.pl b/TAO/tests/POA/Explicit_Activation/run_test.pl index 913b6763afb..5a592319d6a 100755 --- a/TAO/tests/POA/Explicit_Activation/run_test.pl +++ b/TAO/tests/POA/Explicit_Activation/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../Generic_Servant/.'); + $iorbase = "ior"; $iorfile = PerlACE::LocalFile ("$iorbase"); @@ -76,13 +78,13 @@ if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_ if (PerlACE::waitforfile_timed ($iorfile_2, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile_2>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } if (PerlACE::waitforfile_timed ($iorfile_3, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile_3>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } diff --git a/TAO/tests/POA/Loader/run_test.pl b/TAO/tests/POA/Loader/run_test.pl index 559d008288d..01a11d6e792 100755 --- a/TAO/tests/POA/Loader/run_test.pl +++ b/TAO/tests/POA/Loader/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../Generic_Servant/.'); + $iorbase = "ior"; $iorfile = PerlACE::LocalFile ("$iorbase"); @@ -73,7 +75,7 @@ if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_ if (PerlACE::waitforfile_timed ($iorfile_2, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile_2>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } diff --git a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc index 0e0cc5e6d44..bb5b79d1421 100644 --- a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc +++ b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc @@ -9,6 +9,7 @@ project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_c includes += $(srcdir)/../Generic_Servant } includes += ../Generic_Servant + libpaths += ../Generic_Servant Source_Files { server.cpp diff --git a/TAO/tests/POA/On_Demand_Activation/run_test.pl b/TAO/tests/POA/On_Demand_Activation/run_test.pl index c3d80c769f4..36532adbe9d 100755 --- a/TAO/tests/POA/On_Demand_Activation/run_test.pl +++ b/TAO/tests/POA/On_Demand_Activation/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../Generic_Servant/.'); + $iorbase = "ior"; $iorfile = PerlACE::LocalFile ("$iorbase"); @@ -68,7 +70,7 @@ if ($server != 0) { if (PerlACE::waitforfile_timed ($iorfile_1, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile_1>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } diff --git a/TAO/tests/POA/On_Demand_Loading/run_test.pl b/TAO/tests/POA/On_Demand_Loading/run_test.pl index d25948c1ce4..6fd6d0c7dd5 100755 --- a/TAO/tests/POA/On_Demand_Loading/run_test.pl +++ b/TAO/tests/POA/On_Demand_Loading/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../Generic_Servant/.'); + $iorfile = "ior"; $oneway = ""; @@ -55,10 +57,10 @@ if (PerlACE::is_vxworks_test()) { else { $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args"); } -$CL1 = new PerlACE::Process ("../Generic_Servant/client", +$CL1 = new PerlACE::Process ("../Generic_Servant/client", "$extra_args $oneway -i $iterations -k file://$iorfile1"); $CL2 = new PerlACE::Process ("../Generic_Servant/client", - "$extra_args $oneway -i $iterations -k file://$iorfile2 -x"); + "$extra_args $oneway -i $iterations -k file://$iorfile2 -x"); $server = $SV->Spawn (); @@ -97,7 +99,7 @@ $server = $SV->WaitKill (5); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; - $SV->Kill (); + $SV->Kill (); $status = 1; } diff --git a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc index 117b2ce33da..bc6c6c3cf22 100644 --- a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc +++ b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc @@ -9,6 +9,7 @@ project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_c includes += $(srcdir)/../Generic_Servant } includes += ../Generic_Servant + libpaths += ../Generic_Servant Source_Files { server.cpp diff --git a/TAO/tests/POA/Reference_Counted_Servant/run_test.pl b/TAO/tests/POA/Reference_Counted_Servant/run_test.pl index 38c3a37edf3..1cdf516a337 100755 --- a/TAO/tests/POA/Reference_Counted_Servant/run_test.pl +++ b/TAO/tests/POA/Reference_Counted_Servant/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../Generic_Servant/.'); + $iorbase = "poa.ior"; $iorfile = PerlACE::LocalFile ("$iorbase"); @@ -64,7 +66,7 @@ if ($server != 0) { if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp index 6bef8ed251a..5ad447b5c3a 100644 --- a/TAO/tests/Parallel_Connect_Strategy/client.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp @@ -3,16 +3,29 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" +#include "tao/ORB_Core.h" ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; int kill_server = 0; +bool sanity_timeout = false; + +void hook (TAO_ORB_Core *, + TAO_Stub *, + bool &has_timeout, + ACE_Time_Value &tv) +{ + ACE_DEBUG ((LM_DEBUG, "Timeout hook called\n")); + ACE_Time_Value ten_secs (10, 0); + tv.set (10, 0); + has_timeout = true; +} int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Opt get_opts (argc, argv, "k:xt"); int c; while ((c = get_opts ()) != -1) @@ -24,6 +37,9 @@ parse_args (int argc, char *argv[]) case 'x': kill_server = 1; break; + case 't': + sanity_timeout = true; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, @@ -49,6 +65,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; + if (sanity_timeout) + { + ACE_DEBUG ((LM_DEBUG, "Installing sanity timeout\n")); + orb->orb_core ()->connection_timeout_hook (hook); + } + CORBA::Object_var tmp = orb->string_to_object(ior); diff --git a/TAO/tests/Parallel_Connect_Strategy/run_test.pl b/TAO/tests/Parallel_Connect_Strategy/run_test.pl index a2bdcd6f6df..c91cae4b59d 100755 --- a/TAO/tests/Parallel_Connect_Strategy/run_test.pl +++ b/TAO/tests/Parallel_Connect_Strategy/run_test.pl @@ -33,6 +33,10 @@ $CL_CORBALOC = new PerlACE::Process ("client", "-ORBUseSharedProfile 1 -ORBusePa $CL_Reactive = new PerlACE::Process ("client", "-ORBSvcConf reactive.conf -ORBuseParallelConnects 1 -k file://$iorfile"); $CL_Blocked = new PerlACE::Process ("client", "-ORBSvcConf blocked.conf -ORBuseParallelConnects 1 -k file://$iorfile"); $CL_None = new PerlACE::Process ("client", "-ORBuseParallelConnects 0 -k file://$iorfile"); +if ($ARGV[0] eq '-quick') { + $CL_Blocked = new PerlACE::Process ("client", "-ORBSvcConf blocked.conf -ORBuseParallelConnects 1 -k file://$iorfile -t"); + $CL_None = new PerlACE::Process ("client", "-ORBuseParallelConnects 0 -k file://$iorfile -t"); +} $CL_Shutdown = new PerlACE::Process ("client", "-ORBuseParallelConnects 1 -k file://$iorfile -x"); $SV_ALT_IIOP->Spawn (); diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl index da007903756..3eef51efca3 100755 --- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl +++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl @@ -79,15 +79,15 @@ sub run_server $SV->Spawn (); - $server = $SV->Wait (10); - if ($server == 0) - { - return 0; - } + # $server = $SV->Wait (10); + # if ($server == 0) + # { + # return 0; + # } for $file (@$iorfiles) { - if (PerlACE::waitforfile_timed ($file, 1) == -1) + if (PerlACE::waitforfile_timed ($file, 5) == -1) { print STDERR "ERROR: cannot find ior file: $file\n"; $status = 1; diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp index b33e02a1080..6efb3fa944c 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -104,7 +104,7 @@ Thread_Task::svc (void) } } - ACE_OS::sleep (50); + ACE_OS::sleep (10); this->current_->end_scheduling_segment (name); // End - Nested Scheduling Segment diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp index 6b97b21f2c6..8e343179baf 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp @@ -30,7 +30,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Waiting for Threads to Activate...\n")); - ACE_OS::sleep (10); + ACE_OS::sleep (5); ACE_DEBUG ((LM_DEBUG, "Threads Activated\n")); diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc index 0062f6026ca..da07650f146 100644 --- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc +++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc @@ -33,3 +33,16 @@ project(*Client): taoclient, anytypecode { IDL_Files { } } + +project(*ShutdownClient): taoclient, anytypecode { + after += *idl + exename = shutdown_client + Source_Files { + client2.cpp + } + Source_Files { + TestC.cpp + } + IDL_Files { + } +} diff --git a/TAO/tests/Server_Connection_Purging/Test.idl b/TAO/tests/Server_Connection_Purging/Test.idl index ca9b3e126c0..add2175d346 100644 --- a/TAO/tests/Server_Connection_Purging/Test.idl +++ b/TAO/tests/Server_Connection_Purging/Test.idl @@ -7,4 +7,5 @@ interface test */ void send_stuff(in string foo); + oneway void shutdown (); }; diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp index ab05f3a1171..575b31ef71c 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.cpp +++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp @@ -3,8 +3,21 @@ // #include "Test_i.h" +test_i::test_i (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + void test_i::send_stuff (const char* string) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string)); } + +void +test_i::shutdown (void) +{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) About to invoke shudown... \n")); + this->orb_->shutdown (0); +} diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h index e3ac4b3cc1c..689d8c3cd7b 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.h +++ b/TAO/tests/Server_Connection_Purging/Test_i.h @@ -12,10 +12,15 @@ class test_i : public virtual POA_test { public: + test_i (CORBA::ORB_ptr orb); + // = The skeleton methods virtual void send_stuff (const char* string); + virtual void shutdown (void); + private: + CORBA::ORB_var orb_; }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp index 04c1e3e4548..450e88c13cb 100644 --- a/TAO/tests/Server_Connection_Purging/client.cpp +++ b/TAO/tests/Server_Connection_Purging/client.cpp @@ -114,11 +114,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "Registration failed \n"), -1); - ACE_Time_Value tv (1); + // ACE_Time_Value tv (1); + + // while (singleton->handle_events (&tv) >= 1); - while (singleton->handle_events (&tv) >= 1); } + // Handle events moved to here to prevent this test taking best part + // of a minute + ACE_Time_Value tv (3); + while (singleton->handle_events (&tv) >= 1); + // Remove the handlers to avoid the possibility of the reactor // using any of them after they leave the scope (those that haven't // been closed and removed already, that is). diff --git a/TAO/tests/Server_Connection_Purging/client2.cpp b/TAO/tests/Server_Connection_Purging/client2.cpp new file mode 100644 index 00000000000..a6db16230b9 --- /dev/null +++ b/TAO/tests/Server_Connection_Purging/client2.cpp @@ -0,0 +1,78 @@ +// $Id$ + + +#include "ace/Get_Opt.h" +#include "TestC.h" + +// Name of file contains ior. +static const char *IOR = "file://ior"; + +static int +parse_args (int argc, char **argv) +{ + ACE_Get_Opt get_opts (argc, argv, "k:i:d:x"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + IOR = get_opts.opt_arg (); + break; + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k IOR " + "\n", + argv [0]), + -1); + } + + if (IOR == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Please specify the IOR for the servant\n"), -1); + + // Indicates successful parsing of command line. + return 0; +} + + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + + try + { + // Initialize the ORB. + CORBA::ORB_var orb = + CORBA::ORB_init (argc, + argv, + 0); + + // Initialize options based on command-line arguments. + int parse_args_result = parse_args (argc, argv); + if (parse_args_result != 0) + return parse_args_result; + + // Get an object reference from the argument string. + CORBA::Object_var object = + orb->string_to_object (IOR); + + // Try to narrow the object reference to a <test> reference. + test_var test_object = test::_narrow (object.in ()); + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Sending a shutdown call..\n")); + test_object->shutdown (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return -1; + } + + return 0; +} diff --git a/TAO/tests/Server_Connection_Purging/run_test.pl b/TAO/tests/Server_Connection_Purging/run_test.pl index ccaf6a19c58..80f54229e95 100755 --- a/TAO/tests/Server_Connection_Purging/run_test.pl +++ b/TAO/tests/Server_Connection_Purging/run_test.pl @@ -43,6 +43,17 @@ if ($client != 0) { $status = 1; } +print "Calling shutdown client\n"; + +$SHUTDOWN = new PerlACE::Process ("shutdown_client", "-k file://$iorfile"); + +$client = $SHUTDOWN->SpawnWaitKill (300); + +if ($client != 0) { + print STDERR "ERROR: shutdown_client returned $client\n"; + $status = 1; +} + $server = $SV->WaitKill (120); if ($server != 0) { diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index efd5c526956..8c4b4a14f81 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -55,7 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) test_i *test_impl; ACE_NEW_RETURN (test_impl, - test_i (), + test_i (orb), 1); PortableServer::ServantBase_var owner_transfer(test_impl); diff --git a/TAO/tests/Single_Read/run_test.pl b/TAO/tests/Single_Read/run_test.pl index e4837b75540..bf809ac2f61 100755 --- a/TAO/tests/Single_Read/run_test.pl +++ b/TAO/tests/Single_Read/run_test.pl @@ -9,8 +9,10 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); +$client_done_file = PerlACE::LocalFile ("client_done"); unlink $iorfile; +unlink $client_done_file; $status = 0; if (PerlACE::is_vxworks_test()) { @@ -39,6 +41,10 @@ if ($client != 0) { $status = 1; } +open (FILE , ">$client_done_file"); +print FILE "Client Done !\n"; +close (FILE); + $server = $SV->WaitKill (400); if ($server != 0) { @@ -48,5 +54,6 @@ if ($server != 0) { } unlink $iorfile; +unlink $client_done_file; exit $status; diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp index 0d1ad577560..2e055159cf6 100644 --- a/TAO/tests/Single_Read/test_i.cpp +++ b/TAO/tests/Single_Read/test_i.cpp @@ -6,7 +6,8 @@ ACE_RCSID(Single_Read, test_i, "$Id$") test_i::test_i (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) + : orb_ (CORBA::ORB::_duplicate (orb)), + client_done_ (false) { } @@ -18,11 +19,26 @@ test_i::method (CORBA::ULong request_number, ACE_TEXT ("server: Iteration %d @ %T\n"), request_number)); - // Time required to process this request. - ACE_Time_Value work_time (0, - 3000 * 1000); + if (!client_done_) + { + FILE *input_file = ACE_OS::fopen ("client_done", "r"); + if (input_file == 0) + { + // Time required to process this request. + ACE_Time_Value work_time (0, + 3000 * 1000); - ACE_OS::sleep (work_time); + ACE_OS::sleep (work_time); + } + else + { + // The client is long gone because the run_test.pl has created + // the file to let us know. There's no need to keep on with + // these pointless sleeps + client_done_ = true; + ACE_OS::fclose (input_file); + } + } } void diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h index a6de2d05838..f923a31f3b6 100644 --- a/TAO/tests/Single_Read/test_i.h +++ b/TAO/tests/Single_Read/test_i.h @@ -37,6 +37,8 @@ private: /// The ORB. CORBA::ORB_var orb_; + CORBA::Boolean client_done_; + }; #endif /* TAO_SINGLE_READ_TEST_I_H*/ diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp index 2dceda6460f..a0e43c9d2db 100644 --- a/TAO/tests/Stack_Recursion/client.cpp +++ b/TAO/tests/Stack_Recursion/client.cpp @@ -8,16 +8,20 @@ ACE_RCSID(Stack_Recursion, "$Id$") const char *ior = "file://test.ior"; +static int iterations = 1000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, "i:k:"); int c; while ((c = get_opts ()) != -1) switch (c) { + case 'i': + iterations = ACE_OS::atoi (get_opts.opt_arg ()); + break; case 'k': ior = get_opts.opt_arg (); break; @@ -61,7 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Client_Task client_task (sender.in (), - 1000, + iterations, 1048576, ACE_Thread_Manager::instance ()); diff --git a/TAO/tests/Stack_Recursion/run_test.pl b/TAO/tests/Stack_Recursion/run_test.pl index 6df72fae80b..c3a89ac4cfa 100755 --- a/TAO/tests/Stack_Recursion/run_test.pl +++ b/TAO/tests/Stack_Recursion/run_test.pl @@ -20,7 +20,14 @@ if (PerlACE::is_vxworks_test()) { else { $SV = new PerlACE::Process ("server", "-o $iorfile"); } -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); + +$iterations = 1000; + +if ($ARGV[0] eq '-quick') { + $iterations = 100; +} + +$CL = new PerlACE::Process ("client", " -k file://$iorfile -i $iterations"); $SV->Spawn (); diff --git a/TAO/tests/TransportCurrent/Framework/run_test.pl b/TAO/tests/TransportCurrent/Framework/run_test.pl index e57d588458e..5a1a57145cc 100755 --- a/TAO/tests/TransportCurrent/Framework/run_test.pl +++ b/TAO/tests/TransportCurrent/Framework/run_test.pl @@ -9,6 +9,8 @@ use lib "$ENV{ACE_ROOT}/bin"; use Config; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + sub add_path { my($name) = shift; my($value) = shift; diff --git a/TAO/tests/TransportCurrent/IIOP/run_test.pl b/TAO/tests/TransportCurrent/IIOP/run_test.pl index bf6740196f4..081870452a6 100755 --- a/TAO/tests/TransportCurrent/IIOP/run_test.pl +++ b/TAO/tests/TransportCurrent/IIOP/run_test.pl @@ -9,6 +9,8 @@ use lib "$ENV{ACE_ROOT}/bin"; use Config; use PerlACE::Run_Test; +PerlACE::add_lib_path ('../lib'); + sub add_path { my($name) = shift; my($value) = shift; |