diff options
Diffstat (limited to 'TAO')
48 files changed, 163 insertions, 96 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0dbf2e781e3..0e8eecba4fa 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,59 @@ +Mon Oct 21 14:29:54 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/AMH/Sink_Server/run_test.pl: + * examples/Simple/time-date/run_test.pl: + * orbsvcs/examples/RtEC/Simple/run_test.pl: + * orbsvcs/examples/Security/Send_File/run_test.pl: + * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: + * orbsvcs/tests/AVStreams/Multicast/run_test.pl: + * orbsvcs/tests/CosEvent/Basic/run_test.pl: + * orbsvcs/tests/EC_Mcast/run_test.pl: + * orbsvcs/tests/EC_Throughput/run_test.pl: + * orbsvcs/tests/Event/Basic/exhaustive_test.pl: + * orbsvcs/tests/Event/Basic/run_test.pl: + * orbsvcs/tests/Event/Performance/run_test.pl: + * orbsvcs/tests/Miop/McastHello/run_test.pl: + * orbsvcs/tests/Notify/Blocking/run_test.pl: + * orbsvcs/tests/Notify/Discarding/run_test.pl: + * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: + * orbsvcs/tests/Notify/Ordering/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/performance-tests/Filter/run_test.pl: + * orbsvcs/tests/Security/Big_Request/run_test.pl: + * orbsvcs/tests/Security/Callback/run_test.pl: + * orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: + * orbsvcs/tests/Security/Secure_Invocation/run_test.pl: + * orbsvcs/tests/Security/SecurityLevel1/run_test.pl: + * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: + * performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: + * performance-tests/Latency/Single_Threaded/default_configuration.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl: + * performance-tests/RTCorba/Thread_Pool/native-svc.conf: + * performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml: + * performance-tests/RTCorba/Thread_Pool/run_test.pl: + * performance-tests/RTCorba/Thread_Pool/svc.conf-native: + * performance-tests/Throughput/run_test.pl: + * tests/AMI/run_test.pl: + * tests/Connect_Strategy_Test/run_test.pl: + * tests/Connection_Purging/run_test.pl: + * tests/LongUpcalls/run_test.pl: + * tests/MT_BiDir/run_test.pl: + * tests/MT_Client/run_test.pl: + * tests/MT_Server/run_test.pl: + * tests/No_Server_MT_Connect_Test/run_test.pl: + * tests/OctetSeq/run_test1.pl: + * tests/OctetSeq/run_test2.pl: + * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: + * tests/RTCORBA/Server_Protocol/run_test.pl: + * tests/Strategies/run_test.pl: Changed to use the svcconf file + extension ($PerlACE::svcconf_ext) defined in PerlACE::Run_Test + to switch between conventional svc.conf files and XML-based + svc.conf files. The default file extension is ".conf". To use + XML-based format, you need to define an environment variable + ACE_RUNTEST_SVCCONF_EXT as ".conf.xml". + Mon Oct 21 14:27:44 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tests/DLL_ORB/Makefile.Test_Client_Module: diff --git a/TAO/examples/AMH/Sink_Server/run_test.pl b/TAO/examples/AMH/Sink_Server/run_test.pl index e71b8605b50..65254b4c6e5 100755 --- a/TAO/examples/AMH/Sink_Server/run_test.pl +++ b/TAO/examples/AMH/Sink_Server/run_test.pl @@ -26,7 +26,9 @@ $iorfile = PerlACE::LocalFile("amh.ior"); unlink $iorfile; $delay_time = $reply_delay_time*1000; #convert to microseconds -$AMH = new PerlACE::Process ("st_server", "-ORBsvcconf st_server.conf -o $iorfile -s $delay_time"); +$AMH = new PerlACE::Process ("st_server", "-ORBsvcconf st_server" . + "$PerlACE::svcconf_ext". + " -o $iorfile -s $delay_time"); $CL = new PerlACE::Process ("client", "-k file://$iorfile -n $iterations"); print STDERR "\n Starting AMH Sink Server with $reply_delay_time milliseconds delayed response: \n\n"; diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl index 4915149ec32..878cb5a5623 100755 --- a/TAO/examples/Simple/time-date/run_test.pl +++ b/TAO/examples/Simple/time-date/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $status = 0; $iorfile = "ior"; -$conf = PerlACE::LocalFile ("client.conf"); +$conf = PerlACE::LocalFile ("client" . "$PerlACE::svcconf_ext"); # Remove the file before starting the test. unlink $iorfile; diff --git a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl b/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl index b9fdb3a3cac..c6569e66368 100755 --- a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl +++ b/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl @@ -11,7 +11,7 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile ("ec.ior"); -$conffile = PerlACE::LocalFile ("ec.conf"); +$conffile = PerlACE::LocalFile ("ec" . "$PerlACE::svcconf_ext"); unlink $iorfile; diff --git a/TAO/orbsvcs/examples/Security/Send_File/run_test.pl b/TAO/orbsvcs/examples/Security/Send_File/run_test.pl index 963e56fd136..b7b2ed47fea 100755 --- a/TAO/orbsvcs/examples/Security/Send_File/run_test.pl +++ b/TAO/orbsvcs/examples/Security/Send_File/run_test.pl @@ -18,8 +18,9 @@ $ENV{'SSL_CERT_FILE'} = 'cacert.pem'; $iorfile = "server.ior"; unlink $iorfile; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBSvcConf server_nopasswd.conf " - . " -o $iorfile"); + " -ORBSvcConf server_nopasswd" . + "$PerlACE::svcconf_ext " . + " -o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; @@ -28,8 +29,9 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { } $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client_nopasswd.conf " - . " -k file://$iorfile < client.cpp"); + " -ORBSvcConf client_nopasswd" . + "$PerlACE::svcconf_ext " . + " -k file://$iorfile < client.cpp"); $client = $CL->TimedWait (60); if ($client == -1) { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl index 08ca59f2925..878b86cc065 100755 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl @@ -22,15 +22,15 @@ $makefile = PerlACE::LocalFile ("input"); unlink $nsior; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-ORBDottedDecimalAddresses 1 -o $nsior"); -$SV1 = new PerlACE::Process ("sender", "-ORBDottedDecimalAddresses 1 ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r 30"); -$SV2 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r 30"); -$SV3 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r 30"); -$RE1 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s distributer -r receiver1 -f output1"); -$RE2 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s distributer -r receiver2 -f output2"); -$DI1 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r distributer"); -$DI2 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r distributer"); -$DI3 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r distributer"); -$DI4 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r distributer"); +$SV1 = new PerlACE::Process ("sender", "-ORBDottedDecimalAddresses 1 ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30"); +$SV2 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30"); +$SV3 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30"); +$RE1 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s distributer -r receiver1 -f output1"); +$RE2 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s distributer -r receiver2 -f output2"); +$DI1 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r distributer"); +$DI2 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r distributer"); +$DI3 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r distributer"); +$DI4 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r distributer"); print STDERR "\nReceiver 1 --> Receiver 2 --> Distributer 1 --> Sender1 --> Distributer 2 --> Distributer 3 --> Sender2 --> Sender3 --> Distributer4\n\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl index 84f5aec1fcf..1f9ae20a47d 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl @@ -23,7 +23,7 @@ unlink $nsior, $test1, $test2; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); $SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1"); $SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2"); -$CL = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -f $makefile"); +$CL = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -f $makefile"); print STDERR "Starting Naming Service\n"; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl index 2f5ff8af44c..359318a505c 100755 --- a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl @@ -13,7 +13,7 @@ use PerlACE::Run_Test; $status = 0; -$svc_pull_conf = PerlACE::LocalFile ("svc.pull.conf"); +$svc_pull_conf = PerlACE::LocalFile ("svc.pull$PerlACE::svcconf_ext"); sub RunTest ($$$) { diff --git a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl index 443a19d3e24..21219bb625c 100755 --- a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl @@ -11,7 +11,7 @@ use PerlACE::Run_Test; $status = 0; $sample_cfg = PerlACE::LocalFile ("sample.cfg"); -$svc_conf = PerlACE::LocalFile ("svc.conf"); +$svc_conf = PerlACE::LocalFile ("svc$PerlACE::svcconf_ext"); # Run two copies of the same test... $T1 = new PerlACE::Process ("EC_Mcast", diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index 46185c56ada..9a6c9f60343 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -10,8 +10,8 @@ use PerlACE::Run_Test; $status = 0; -$ec_conf = PerlACE::LocalFile ("ec.conf"); -$ec_mt_conf = PerlACE::LocalFile ("ec_mt.conf"); +$ec_conf = PerlACE::LocalFile ("ec$PerlACE::svcconf_ext"); +$ec_mt_conf = PerlACE::LocalFile ("ec$PerlACE::svcconf_ext"); print STDERR "================ Collocated tests, single threaded\n"; diff --git a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl index 8ac6b2e0dc1..417288cbe25 100755 --- a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl +++ b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl @@ -13,7 +13,7 @@ use PerlACE::Run_Test; $status = 0; -$conf_file = PerlACE::LocalFile ('exhaustive.conf'); +$conf_file = PerlACE::LocalFile ('exhaustive$PerlACE::svcconf_ext'); @dispatching_configs = ("-ECDispatching reactive", "-ECDispatching mt -ECDispatchingThreads 4"); diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl index cbe4506e0d2..daa88c808d1 100755 --- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl @@ -13,12 +13,12 @@ use PerlACE::Run_Test; $status = 0; -$svc_conf = PerlACE::LocalFile ("svc.conf"); -$observer_conf = PerlACE::LocalFile ("observer.conf"); -$svc_complex_conf = PerlACE::LocalFile ("svc.complex.conf"); -$mt_svc_conf = PerlACE::LocalFile ("mt.svc.conf"); -$svc_complex_conf = PerlACE::LocalFile ("svc.complex.conf"); -$control_conf = PerlACE::LocalFile ("control.conf"); +$svc_conf = PerlACE::LocalFile ("svc$PerlACE::svcconf_ext"); +$observer_conf = PerlACE::LocalFile ("observer$PerlACE::svcconf_ext"); +$svc_complex_conf = PerlACE::LocalFile ("svc.complex$PerlACE::svcconf_ext"); +$mt_svc_conf = PerlACE::LocalFile ("mt.svc$PerlACE::svcconf_ext"); +$svc_complex_conf = PerlACE::LocalFile ("svc.complex$PerlACE::svcconf_ext"); +$control_conf = PerlACE::LocalFile ("control$PerlACE::svcconf_ext"); sub RunTest ($$$) { diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl index 56145ed31e7..bde6790200e 100755 --- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl @@ -13,7 +13,7 @@ use PerlACE::Run_Test; $status = 0; -$ec_st_conf = PerlACE::LocalFile ("ec.st.conf"); +$ec_st_conf = PerlACE::LocalFile ("ec.st$PerlACE::svcconf_ext"); sub RunTest ($$$) { diff --git a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl index d8fb7b37a5d..41516c9d327 100755 --- a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl +++ b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl @@ -12,8 +12,8 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$server_conf = PerlACE::LocalFile ("server.conf"); -$client_conf = PerlACE::LocalFile ("client.conf"); +$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); +$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); $SV1 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf"); $SV2 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf"); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index e8ba1ab1fa7..d2c6c3d90cc 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $ior = PerlACE::LocalFile ("supplier.ior"); $notifyior = PerlACE::LocalFile ("notify.ior"); -$notify_conf = PerlACE::LocalFile ("notify.conf"); +$notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext"); $status = 0; unlink $notifyior; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index eb72f8dd49a..4ab749ddb0a 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $ior = PerlACE::LocalFile ("supplier.ior"); $notifyior = PerlACE::LocalFile ("notify.ior"); -$notify_conf = PerlACE::LocalFile ("notify.conf"); +$notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext"); $status = 0; $deadline = 0; diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index e615ffe0984..e248a9b3207 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -12,10 +12,10 @@ $ior = PerlACE::LocalFile ("supplier.ior"); $notify_ior = PerlACE::LocalFile ("notify.ior"); $notify_out = PerlACE::LocalFile ("notify.out"); -$notify_nothreads_conf = PerlACE::LocalFile ("notify_nothreads.conf"); -$notify_mtdispatching_conf = PerlACE::LocalFile ("notify_mtdispatching.conf"); -$notify_mtsource_conf = PerlACE::LocalFile ("notify_mtsource.conf"); -$notify_mtlistener_conf = PerlACE::LocalFile ("notify_mtlistener.conf"); +$notify_nothreads_conf = PerlACE::LocalFile ("notify_nothreads$PerlACE::svcconf_ext"); +$notify_mtdispatching_conf = PerlACE::LocalFile ("notify_mtdispatching$PerlACE::svcconf_ext"); +$notify_mtsource_conf = PerlACE::LocalFile ("notify_mtsource$PerlACE::svcconf_ext"); +$notify_mtlistener_conf = PerlACE::LocalFile ("notify_mtlistener$PerlACE::svcconf_ext"); $status = 0; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index 511a2d90f10..94e15581be2 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $ior = PerlACE::LocalFile ("supplier.ior"); $notifyior = PerlACE::LocalFile ("notify.ior"); -$notify_conf = PerlACE::LocalFile ("notify.conf"); +$notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext"); $status = 0; $deadline = 0; 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 28a9926528a..7e18cde92f8 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 @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $ior = PerlACE::LocalFile ("supplier.ior"); $notifyior = PerlACE::LocalFile ("notify.ior"); -$notify_conf = PerlACE::LocalFile ("notify.conf"); +$notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext"); $status = 0; unlink $notifyior; 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 8689951739c..095235dd559 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $ior = PerlACE::LocalFile ("supplier.ior"); $notifyior = PerlACE::LocalFile ("notify.ior"); -$notify_conf = PerlACE::LocalFile ("notify.conf"); +$notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext"); $status = 0; unlink $notifyior; 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 74b492a1795..7dbaa140fca 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $ior = PerlACE::LocalFile ("supplier.ior"); $notifyior = PerlACE::LocalFile ("notify.ior"); -$notify_conf = PerlACE::LocalFile ("notify.conf"); +$notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext"); $status = 0; unlink $notifyior; diff --git a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl index c0683d7cd6c..8c19e2c474c 100755 --- a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl +++ b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl @@ -19,9 +19,9 @@ $status = 0; $ENV{'SSL_CERT_FILE'} = 'cacert.pem'; $SV = new PerlACE::Process ("server", - "-o $file -ORBSvcConf server.conf"); + "-o $file -ORBSvcConf server$PerlACE::svcconf_ext"); $CL = new PerlACE::Process ("client", - "-ORBSvcConf client.conf -k file://$file"); + "-ORBSvcConf client$PerlACE::svcconf_ext -k file://$file"); print STDERR "\n\n==== Running SSLIOP Big_Request test\n"; diff --git a/TAO/orbsvcs/tests/Security/Callback/run_test.pl b/TAO/orbsvcs/tests/Security/Callback/run_test.pl index 25fb1369755..b18cf0329fe 100755 --- a/TAO/orbsvcs/tests/Security/Callback/run_test.pl +++ b/TAO/orbsvcs/tests/Security/Callback/run_test.pl @@ -19,9 +19,9 @@ $status = 0; $ENV{'SSL_CERT_FILE'} = 'cacert.pem'; $SV = new PerlACE::Process ("server", - "-o $file -ORBSvcConf server.conf"); + "-o $file -ORBSvcConf server$PerlACE::svcconf_ext"); $CL = new PerlACE::Process ("client", - "-ORBSvcConf client.conf"); + "-ORBSvcConf client$PerlACE::svcconf_ext"); print STDERR "\n\n==== Running SSLIOP Callback test\n"; diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl index 49ec72125c7..24846ed2477 100755 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl @@ -12,8 +12,8 @@ use PerlACE::Run_Test; $status = 0; $threads = '2'; $iorfile = PerlACE::LocalFile ("test.ior"); -$sv_conf = PerlACE::LocalFile ("server.conf"); -$cl_conf = PerlACE::LocalFile ("client.conf"); +$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); +$cl_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); unlink $iorfile; diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl index b7a78e13b05..5aa928878ef 100755 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl @@ -20,9 +20,9 @@ $status = 0; $ENV{'SSL_CERT_FILE'} = 'cacert.pem'; $SV = new PerlACE::Process ("server", - "-o $file -ORBSvcConf server.conf"); + "-o $file -ORBSvcConf server$PerlACE::svcconf_ext"); $CL = new PerlACE::Process ("client", - "-ORBSvcConf client.conf -k file://$file"); + "-ORBSvcConf client$PerlACE::svcconf_ext -k file://$file"); print STDERR "\n\n==== Running Secure_Invocation test\n"; diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl b/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl index 3e522f16c9f..1de16551f11 100755 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl @@ -19,9 +19,9 @@ $status = 0; $ENV{'SSL_CERT_FILE'} = 'ca.pem'; $SV = new PerlACE::Process ("server", - "-o $file -ORBSvcConf server.conf"); + "-o $file -ORBSvcConf server$PerlACE::svcconf_ext"); $CL = new PerlACE::Process ("client", - "-ORBSvcConf client.conf -k file://$file"); + "-ORBSvcConf client$PerlACE::svcconf_ext -k file://$file"); print STDERR "\n\n==== Running SecurityLevel1 test\n"; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl index c5dc29165cf..7270bc395da 100755 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl @@ -17,9 +17,9 @@ use English; $status = 0; $iorfile = PerlACE::LocalFile ("cubit.ior"); -$iiop_lite_conf = PerlACE::LocalFile ("iiop_lite.conf"); -$uiop_lite_conf = PerlACE::LocalFile ("uiop_lite.conf"); -$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop.conf"); +$iiop_lite_conf = PerlACE::LocalFile ("iiop_lite$PerlACE::svcconf_ext"); +$uiop_lite_conf = PerlACE::LocalFile ("uiop_lite$PerlACE::svcconf_ext"); +$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop$PerlACE::svcconf_ext"); $svnsflags = " -f $iorfile"; $clnsflags = " -f $iorfile"; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl index 450db14fd79..a8bf87ceef3 100755 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl @@ -17,10 +17,10 @@ use English; $status = 0; $iorfile = PerlACE::LocalFile ("cubit.ior"); -$iiop_lite_conf = PerlACE::LocalFile ("iiop_lite.conf"); -$uiop_lite_conf = PerlACE::LocalFile ("uiop_lite.conf"); -#$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop_lite.conf"); -#$client_shmiop_conf = PerlACE::LocalFile ("client_shmiop_lite.conf"); +$iiop_lite_conf = PerlACE::LocalFile ("iiop_lite$PerlACE::svcconf_ext"); +$uiop_lite_conf = PerlACE::LocalFile ("uiop_lite$PerlACE::svcconf_ext"); +#$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop_lite$PerlACE::svcconf_ext"); +#$client_shmiop_conf = PerlACE::LocalFile ("client_shmiop_lite$PerlACE::svcconf_ext"); $svnsflags = " -f $iorfile"; $clnsflags = " -f $iorfile"; $clflags = ""; diff --git a/TAO/performance-tests/Latency/Single_Threaded/default_configuration.pl b/TAO/performance-tests/Latency/Single_Threaded/default_configuration.pl index daac8404bce..2f01c5c7243 100755 --- a/TAO/performance-tests/Latency/Single_Threaded/default_configuration.pl +++ b/TAO/performance-tests/Latency/Single_Threaded/default_configuration.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile ("test.ior"); -$defaultconf = PerlACE::LocalFile ("default.conf"); +$defaultconf = PerlACE::LocalFile ("default$PerlACE::svcconf_ext"); print STDERR "================ Single-threaded (default) Latency Test\n"; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl index 17b493a1953..5a8f5395891 100755 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl @@ -8,8 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -$client_conf = PerlACE::LocalFile ("client.conf"); -$server_conf = PerlACE::LocalFile ("server.conf"); +$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); +$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); $iorfile = PerlACE::LocalFile ("ior"); $SV = new PerlACE::Process ("server", diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl index e85431f372e..37728c015ef 100755 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl @@ -9,8 +9,8 @@ use lib '../../../../../bin'; use PerlACE::Run_Test; $status = 0; -$client_conf = PerlACE::LocalFile ("client.conf"); -$server_conf = PerlACE::LocalFile ("server.conf"); +$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); +$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); $iorfile = PerlACE::LocalFile ("test.ior"); $SV = new PerlACE::Process ("server", diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf-native b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf index cfda9a19500..cfda9a19500 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf-native +++ b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml new file mode 100644 index 00000000000..5be784bbb45 --- /dev/null +++ b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml @@ -0,0 +1,7 @@ +<?xml version='1.0'?> +<!-- Converted from native-svc.conf by svcconf-convert.pl --> +<ACE_Svc_Conf> + <!-- For testing of RT threads (with native priority) --> + <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM"/> + <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE"/> +</ACE_Svc_Conf> diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl b/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl index 8ce42a5698c..44b7cff1ff3 100755 --- a/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl +++ b/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl @@ -470,7 +470,7 @@ for $pool_priority (@pool_priorities) $new_configuration = {}; if ($native_priorities) { - $pool_args = "-ORBsvcconf svc.conf-native -p invocation-priorities-native"; + $pool_args = "-ORBsvcconf native-svc$PerlACE::svcconf_ext -p invocation-priorities-native"; } $test_type = "work-pool-".$pool_priority; $new_configuration->{description} = $test_type; diff --git a/TAO/performance-tests/Throughput/run_test.pl b/TAO/performance-tests/Throughput/run_test.pl index 3a548abb8f5..216081e452d 100755 --- a/TAO/performance-tests/Throughput/run_test.pl +++ b/TAO/performance-tests/Throughput/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile ("test.ior"); -$svc_conf = PerlACE::LocalFile ("svc.conf"); +$svc_conf = PerlACE::LocalFile ("svc$PerlACE::svcconf_ext"); print STDERR "================ Throughput test\n"; diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl index c4643c52be9..d08ef80dc23 100755 --- a/TAO/tests/AMI/run_test.pl +++ b/TAO/tests/AMI/run_test.pl @@ -8,20 +8,20 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; -$client_conf = PerlACE::LocalFile ("muxed.conf"); +$client_conf = PerlACE::LocalFile ("muxed$PerlACE::svcconf_ext"); $debug_level = '0'; $iterations = '1'; foreach $i (@ARGV) { if ($i eq '-mux') { - $client_conf = PerlACE::LocalFile ("muxed.conf"); + $client_conf = PerlACE::LocalFile ("muxed$PerlACE::svcconf_ext"); } elsif ($i eq '-debug') { $debug_level = '1'; } elsif ($i eq '-exclusive') { - $client_conf = PerlACE::LocalFile ('exclusive.conf'); + $client_conf = PerlACE::LocalFile ('exclusive$PerlACE::svcconf_ext'); } } diff --git a/TAO/tests/Connect_Strategy_Test/run_test.pl b/TAO/tests/Connect_Strategy_Test/run_test.pl index 105bd909c4a..37a2fdc5d4f 100755 --- a/TAO/tests/Connect_Strategy_Test/run_test.pl +++ b/TAO/tests/Connect_Strategy_Test/run_test.pl @@ -14,8 +14,8 @@ $status = 0; $SV = new PerlACE::Process ("server", "-o $iorfile"); $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); -$CL2 = new PerlACE::Process ("client", "-ORBSvcConf reactor.conf -k file://$iorfile"); -$CL3 = new PerlACE::Process ("client", "-ORBSvcConf blocked.conf -k file://$iorfile -x 1"); +$CL2 = new PerlACE::Process ("client", "-ORBSvcConf reactor$PerlACE::svcconf_ext -k file://$iorfile"); +$CL3 = new PerlACE::Process ("client", "-ORBSvcConf blocked$PerlACE::svcconf_ext -k file://$iorfile -x 1"); $SV->Spawn (); diff --git a/TAO/tests/Connection_Purging/run_test.pl b/TAO/tests/Connection_Purging/run_test.pl index 1a9dd8bf073..232eec1f955 100755 --- a/TAO/tests/Connection_Purging/run_test.pl +++ b/TAO/tests/Connection_Purging/run_test.pl @@ -40,7 +40,7 @@ for($i = 0; $i < $server_count; $i++) { $endpoint = "-ORBEndpoint uiop://$socket"; } elsif ($use_shmiop) { - $server_shmiop_conf = PerlACE::LocalFile ("server_shmiop.conf"); + $server_shmiop_conf = PerlACE::LocalFile ("server_shmiop$PerlACE::svcconf_ext"); $endpoint = "-ORBEndpoint shmiop:// -ORBSvcConf $server_shmiop_conf"; } @@ -56,8 +56,8 @@ for($i = 0; $i < $server_count; $i++) { } } -foreach $conf ("client.lru.conf", "client.lfu.conf", - "client.fifo.conf", "client.null.conf") { +foreach $conf ("client.lru$PerlACE::svcconf_ext", "client.lfu$PerlACE::svcconf_ext", + "client.fifo$PerlACE::svcconf_ext", "client.null$PerlACE::svcconf_ext") { print "========== Client using $conf configurator file =========\n"; $CL = new PerlACE::Process ("client", " -k $iorfile " . "-ORBSvcConf $conf ". diff --git a/TAO/tests/LongUpcalls/run_test.pl b/TAO/tests/LongUpcalls/run_test.pl index a427d4035a1..c02f3c6b708 100755 --- a/TAO/tests/LongUpcalls/run_test.pl +++ b/TAO/tests/LongUpcalls/run_test.pl @@ -11,7 +11,7 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile ("test.ior"); -$svcfile = PerlACE::LocalFile ("svc.conf"); +$svcfile = PerlACE::LocalFile ("svc$PerlACE::svcconf_ext"); $BSV = new PerlACE::Process ("blocking_server", "-ORBSvcConf $svcfile -o $iorfile"); diff --git a/TAO/tests/MT_BiDir/run_test.pl b/TAO/tests/MT_BiDir/run_test.pl index c685bb42dd3..d78718568ee 100755 --- a/TAO/tests/MT_BiDir/run_test.pl +++ b/TAO/tests/MT_BiDir/run_test.pl @@ -10,11 +10,11 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile ("test.ior"); -$svcconf = PerlACE::LocalFile ("bala.conf"); +$svcconf = PerlACE::LocalFile ("bala$PerlACE::svcconf_ext"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBSvcConf server.conf -o $iorfile -c 3 -i 100"); +$SV = new PerlACE::Process ("server", "-ORBSvcConf server$PerlACE::svcconf_ext -o $iorfile -c 3 -i 100"); $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl index 1d1121543fc..de09aa9f7d8 100755 --- a/TAO/tests/MT_Client/run_test.pl +++ b/TAO/tests/MT_Client/run_test.pl @@ -8,8 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; -$client_conf = PerlACE::LocalFile ("client.global.conf"); -$server_conf = PerlACE::LocalFile ("server.conf"); +$client_conf = PerlACE::LocalFile ("client.global$PerlACE::svcconf_ext"); +$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); $client_process = "client"; $debug_level = '0'; $threads = '4'; @@ -17,7 +17,7 @@ $status = 0; foreach $i (@ARGV) { if ($i eq '-tss') { - $client_conf = PerlACE::LocalFile ("client.tss.conf"); + $client_conf = PerlACE::LocalFile ("client.tss$PerlACE::svcconf_ext"); } elsif ($i eq '-debug') { $debug_level = '1'; } elsif ($i eq '-creation') { diff --git a/TAO/tests/MT_Server/run_test.pl b/TAO/tests/MT_Server/run_test.pl index 185af771d9c..4555d61fbe7 100755 --- a/TAO/tests/MT_Server/run_test.pl +++ b/TAO/tests/MT_Server/run_test.pl @@ -11,7 +11,7 @@ use PerlACE::Run_Test; $status = 0; $threads = '8'; $iorfile = PerlACE::LocalFile ("test.ior"); -$sv_conf = PerlACE::LocalFile ("server.conf"); +$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); unlink $iorfile; diff --git a/TAO/tests/No_Server_MT_Connect_Test/run_test.pl b/TAO/tests/No_Server_MT_Connect_Test/run_test.pl index b6ac0849cfb..63a35c8269c 100755 --- a/TAO/tests/No_Server_MT_Connect_Test/run_test.pl +++ b/TAO/tests/No_Server_MT_Connect_Test/run_test.pl @@ -16,8 +16,8 @@ $SV = new PerlACE::Process ("server", "-o $iorfile"); $CL1 = new PerlACE::Process ("client", "-k file://$iorfile -x"); # Use a single thread in this test, because the strategy is only for # single threaded cases -$CL2 = new PerlACE::Process ("client", "-ORBSvcConf reactor.conf -n 1 -k file://$iorfile"); -$CL3 = new PerlACE::Process ("client", "-ORBSvcConf blocked.conf -k file://$iorfile"); +$CL2 = new PerlACE::Process ("client", "-ORBSvcConf reactor$PerlACE::svcconf_ext -n 1 -k file://$iorfile"); +$CL3 = new PerlACE::Process ("client", "-ORBSvcConf blocked$PerlACE::svcconf_ext -k file://$iorfile"); $SV->Spawn (); diff --git a/TAO/tests/OctetSeq/run_test1.pl b/TAO/tests/OctetSeq/run_test1.pl index c4cfa193173..5d8b133797d 100755 --- a/TAO/tests/OctetSeq/run_test1.pl +++ b/TAO/tests/OctetSeq/run_test1.pl @@ -13,9 +13,9 @@ $iorfile = PerlACE::LocalFile ("test1.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBSvcConf svc1.conf -o $iorfile"); -$CL = new PerlACE::Process ("client", "-ORBSvcConf svc1.conf -i 5000 -k file://$iorfile"); -$T = new PerlACE::Process ("OctetSeq", "-ORBSvcConf svc1.conf -n 32 -l 8192 -h 8192 -s 1 -q"); +$SV = new PerlACE::Process ("server", "-ORBSvcConf svc1$PerlACE::svcconf_ext -o $iorfile"); +$CL = new PerlACE::Process ("client", "-ORBSvcConf svc1$PerlACE::svcconf_ext -i 5000 -k file://$iorfile"); +$T = new PerlACE::Process ("OctetSeq", "-ORBSvcConf svc1$PerlACE::svcconf_ext -n 32 -l 8192 -h 8192 -s 1 -q"); print STDERR "\n\n==== Octet sequence passing test\n"; diff --git a/TAO/tests/OctetSeq/run_test2.pl b/TAO/tests/OctetSeq/run_test2.pl index ec09a1cb901..9e91bd202e4 100755 --- a/TAO/tests/OctetSeq/run_test2.pl +++ b/TAO/tests/OctetSeq/run_test2.pl @@ -13,9 +13,9 @@ $iorfile = PerlACE::LocalFile ("test2.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBSvcConf svc2.conf -o $iorfile"); -$CL = new PerlACE::Process ("client", "-ORBSvcConf svc2.conf -i 5000 -k file://$iorfile"); -$T = new PerlACE::Process ("OctetSeq", "-ORBSvcConf svc2.conf -n 32 -l 8192 -h 8192 -s 1 -q"); +$SV = new PerlACE::Process ("server", "-ORBSvcConf svc2$PerlACE::svcconf_ext -o $iorfile"); +$CL = new PerlACE::Process ("client", "-ORBSvcConf svc2$PerlACE::svcconf_ext -i 5000 -k file://$iorfile"); +$T = new PerlACE::Process ("OctetSeq", "-ORBSvcConf svc2$PerlACE::svcconf_ext -n 32 -l 8192 -h 8192 -s 1 -q"); print STDERR "\n\n==== Octet sequence passing test\n"; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl index 3be3e51803f..dbdbe58f65c 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl @@ -42,7 +42,7 @@ elsif ($^O eq "hpux") { unlink $iorfile; unlink $data_file; -$server_conf = PerlACE::LocalFile ("server.conf"); +$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); $server_args = "-o $iorfile -ORBdebuglevel $debug_level -ORBsvcconf $server_conf " diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl index a9e5dc3a5de..6c2abab3d58 100755 --- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl @@ -13,11 +13,11 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; $status = 0; -$server_reverse_conf = PerlACE::LocalFile ("server_reverse.conf"); -$server_iiop_conf = PerlACE::LocalFile ("server_iiop.conf"); -$server_uiop_conf = PerlACE::LocalFile ("server_uiop.conf"); -$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop.conf"); -$server_reverse_nt_conf = PerlACE::LocalFile ("server_reverse_nt.conf"); +$server_reverse_conf = PerlACE::LocalFile ("server_reverse$PerlACE::svcconf_ext"); +$server_iiop_conf = PerlACE::LocalFile ("server_iiop$PerlACE::svcconf_ext"); +$server_uiop_conf = PerlACE::LocalFile ("server_uiop$PerlACE::svcconf_ext"); +$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop$PerlACE::svcconf_ext"); +$server_reverse_nt_conf = PerlACE::LocalFile ("server_reverse_nt$PerlACE::svcconf_ext"); # Configurations for all tests to be run. @server_opts = diff --git a/TAO/tests/Strategies/run_test.pl b/TAO/tests/Strategies/run_test.pl index 303a368d48a..6974ab9bc27 100755 --- a/TAO/tests/Strategies/run_test.pl +++ b/TAO/tests/Strategies/run_test.pl @@ -10,8 +10,8 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile ("test.ior"); -$svcconf = PerlACE::LocalFile ("svc.conf"); -$advsvcconf = PerlACE::LocalFile ("advanced_svc.conf"); +$svcconf = PerlACE::LocalFile ("svc$PerlACE::svcconf_ext"); +$advsvcconf = PerlACE::LocalFile ("advanced_svc$PerlACE::svcconf_ext"); print "$svcconf\n"; unlink $iorfile; |