diff options
86 files changed, 346 insertions, 114 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index f26a4d49b5f..6499e568998 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,95 @@ +Thu Aug 19 09:44:48 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/Plan_Launcher/Plan_Launcher.cpp: + Fixed typo + + * DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl: + * DAnCE/tests/LocalityManager/CommandlinePassage/run_test.pl: + * DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl: + * DAnCE/tests/LocalityManager/ProcessName/run_test.pl: + * DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: + * DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: + * ciao/Servants/Connector_Servant_Impl_Base.cpp: + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl: + * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: + * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: + * connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl: + * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: + * connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl: + * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl: + * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: + * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: + * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: + * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: + * connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl: + * connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl: + * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl: + * connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl: + * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl: + * connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl: + * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl: + * connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: + * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: + * examples/BasicSP/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: + * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: + * examples/Hello/descriptors/run_test_alias.pl: + * examples/Hello/descriptors/run_test_without_ns.pl: + * performance-tests/Benchmark/Multi_Threaded/run_test.pl: + * performance-tests/Benchmark/RoundTrip/run_test.pl: + * performance-tests/Benchmark/RoundTripClient/run_test.pl: + * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: + * tests/Bug_3769_Regression/descriptors/run_test.pl: + * tutorials/Quoter/Simple/descriptors/run_test.pl: + Updated message which we print, -q isn't used anymore. Also check + the return value of the plan launcher at shutdown + Wed Aug 18 19:26:51 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Deployment/Handlers/Container_Handler.cpp: diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp index 9f9adf87251..4439a7badc0 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp @@ -106,7 +106,7 @@ usage(const ACE_TCHAR*) ACE_TEXT ("to plan UUID if plan is provided. ") ACE_TEXT ("Default is on for NM-based deployments.\n") - ACE_TEXT ("\t-q|--quiet\t\t\tSupress error messages.\n") + ACE_TEXT ("\t-q|--quiet\t\t\tSuppress error messages.\n") ACE_TEXT ("\t-h|--help\t\t\tShow this usage information\n") )); } diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl index 64c96fe60f3..25b0a58ac1a 100755 --- a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl +++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl @@ -224,7 +224,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/DAnCE/tests/LocalityManager/CommandlinePassage/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/CommandlinePassage/run_test.pl index aa6ae144be9..085056a2e69 100755 --- a/CIAO/DAnCE/tests/LocalityManager/CommandlinePassage/run_test.pl +++ b/CIAO/DAnCE/tests/LocalityManager/CommandlinePassage/run_test.pl @@ -224,7 +224,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl index 9a74c74c0d8..6a54f77e54c 100755 --- a/CIAO/DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl +++ b/CIAO/DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl @@ -224,7 +224,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/DAnCE/tests/LocalityManager/ProcessName/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/ProcessName/run_test.pl index 5c0f5181794..96888dc87b5 100755 --- a/CIAO/DAnCE/tests/LocalityManager/ProcessName/run_test.pl +++ b/CIAO/DAnCE/tests/LocalityManager/ProcessName/run_test.pl @@ -235,7 +235,7 @@ if ($count ne "1\n") { # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl index 9a74c74c0d8..6a54f77e54c 100755 --- a/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl +++ b/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl @@ -224,7 +224,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl index 9a74c74c0d8..6a54f77e54c 100755 --- a/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl +++ b/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl @@ -224,7 +224,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp index c698fdd4fc4..a1d81cfaffe 100644 --- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp +++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp @@ -116,14 +116,14 @@ namespace CIAO throw ::Components::InvalidName (); } - CORBA::Object_ptr retval = this->lookup_facet (name); + CORBA::Object_var retval = this->lookup_facet (name); - if ( ::CORBA::is_nil (retval)) + if ( ::CORBA::is_nil (retval. in())) { throw ::Components::InvalidName (); } - return retval; + return retval._retn (); } #if !defined (CCM_LW) diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl index 3280c9115a4..66f1bd7c157 100755 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (90); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl index f3b1ca1f0ff..414c74b2411 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl index d31cc233df1..8d2ae75d16c 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl index f941755ee57..b6563801873 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl index 8eb81af2d98..5212678f276 100755 --- a/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/GetComp/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (15); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl index f3b1ca1f0ff..414c74b2411 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl index f3b1ca1f0ff..414c74b2411 100755 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl index d31cc233df1..97f1888a09c 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl @@ -223,11 +223,11 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl index f3b1ca1f0ff..414c74b2411 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl index f3b1ca1f0ff..414c74b2411 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl index d31cc233df1..97f1888a09c 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl @@ -223,11 +223,11 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl index 96fdee81b37..ea0600a0a16 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl @@ -224,7 +224,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl index f3b1ca1f0ff..414c74b2411 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl index d31cc233df1..97f1888a09c 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl @@ -223,11 +223,11 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl index d31cc233df1..8d2ae75d16c 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl index 3ceee9d073a..31b68909332 100755 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Deployment/scripts/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl index 42fc287ee32..73e1a373294 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl @@ -223,11 +223,18 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (3 * $tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl index d474b142ff2..ed316762823 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl @@ -223,11 +223,18 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (3 * $tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl index daa8c437fc5..7c405994a71 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl @@ -223,7 +223,7 @@ sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl index f3d94295be5..30232863e70 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl @@ -223,7 +223,7 @@ sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl index d32a8ed9506..c48d79e11e8 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl @@ -223,11 +223,18 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl index d204f1219bf..10c3cebb591 100755 --- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl index 3d1cb2e87cd..71fcae55385 100755 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl index 441ec96522c..f0e29509b65 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl @@ -204,11 +204,18 @@ sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl index 22d684c865b..b62a7e89989 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl @@ -204,11 +204,18 @@ sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl index 1dd06a666c3..25a46cf2226 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl @@ -204,11 +204,18 @@ sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl index e84c68cddb9..0bc09cbd961 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl @@ -204,11 +204,18 @@ sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl index 3e422a2c503..2f70498972d 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl @@ -204,11 +204,18 @@ sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl index 25f13c7de2f..cd5194ecd61 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl @@ -204,11 +204,18 @@ sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl index 1d685e7e1c6..66a14a6f55c 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl @@ -204,11 +204,18 @@ sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl index 66787b9d244..df8a92e96a9 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl @@ -206,11 +206,18 @@ sleep (120); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl index deaf0fbf194..ac96b017b94 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl @@ -222,7 +222,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl index ec87ff15eb0..2ade949dc20 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl index 97f779f538d..bfb5c2088ba 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl index 75adc06ea97..ce55d58a40f 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -q"); + "-k file://$ior_emfile -x $cdp_file -s"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl index 31ccafc9160..e1edba771a6 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl index bcbb9c5ec2e..923fabbf6c3 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl index fd0693f8127..ddf7fcbb1a0 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl index bcbb9c5ec2e..923fabbf6c3 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl index 4790f69c49c..e653d5a6e50 100755 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl index ec87ff15eb0..2ade949dc20 100755 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl index f6d1ce3f1fd..6e029da4028 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (5); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl index f6d1ce3f1fd..6e029da4028 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (5); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl index 4790f69c49c..e653d5a6e50 100755 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl index 4790f69c49c..e653d5a6e50 100755 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl index bcbb9c5ec2e..923fabbf6c3 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl index ec87ff15eb0..2ade949dc20 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl index bcbb9c5ec2e..923fabbf6c3 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl index c62a6e64581..f0dded02000 100755 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (5); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl index b63949a871f..35085abd060 100755 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl @@ -223,11 +223,18 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl index ec87ff15eb0..2ade949dc20 100755 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl index bcbb9c5ec2e..923fabbf6c3 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl index bcbb9c5ec2e..923fabbf6c3 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl index bcbb9c5ec2e..923fabbf6c3 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl index b7cd151063b..ce55d58a40f 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl index 97f779f538d..bfb5c2088ba 100755 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl index 97f779f538d..bfb5c2088ba 100755 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl index 6c99ac03263..abb89e4cb7e 100755 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl index c62a6e64581..f0dded02000 100755 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (5); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl index 3d07854be0f..d01706887b8 100755 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl @@ -223,11 +223,18 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl index 1ef5789b1e5..b369b49acc4 100755 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl @@ -223,11 +223,18 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl index 4790f69c49c..e653d5a6e50 100755 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl index bc19966beb1..76cada14404 100755 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (70); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl index af94d517833..17e74020995 100755 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl index 17a44f22140..c5e47be40b0 100755 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl @@ -223,7 +223,7 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl index 4558df0e65a..d99349a7618 100755 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl @@ -223,7 +223,7 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl index b7f68c74d8b..907ecf547d1 100755 --- a/CIAO/examples/BasicSP/descriptors/run_test.pl +++ b/CIAO/examples/BasicSP/descriptors/run_test.pl @@ -231,11 +231,18 @@ sleep 10; # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl index 6f98763638d..54d4f4e6172 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl @@ -182,11 +182,18 @@ if ($result != 0) { # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl index 501c8786eb8..d050e4deaf2 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl @@ -182,11 +182,18 @@ if ($result != 0) { # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl index 36f07f8b04b..d2a5de6a13a 100755 --- a/CIAO/examples/Hello/descriptors/run_test_alias.pl +++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl @@ -222,11 +222,18 @@ if ($result != 0) { # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl index d22c80e17be..5ab997ab770 100755 --- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl @@ -182,11 +182,18 @@ if ($result != 0) { # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/run_test.pl b/CIAO/performance-tests/Benchmark/Multi_Threaded/run_test.pl index 5c31666c186..d832b314c07 100755 --- a/CIAO/performance-tests/Benchmark/Multi_Threaded/run_test.pl +++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/run_test.pl @@ -81,7 +81,7 @@ sleep (5); #Start the client to send the trigger message $CL = $tg->CreateProcess ("../Multi_Threaded/client", ""); -$CL->SpawnWaitKill($tg->ProcessStopWaitInterval ()); +$CL->SpawnWaitKill($tg->ProcessStartWaitInterval ()); $AM->Kill (); $AD->Kill (); diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/run_test.pl b/CIAO/performance-tests/Benchmark/RoundTrip/run_test.pl index 0364d8b16a4..d6b877b70b2 100755 --- a/CIAO/performance-tests/Benchmark/RoundTrip/run_test.pl +++ b/CIAO/performance-tests/Benchmark/RoundTrip/run_test.pl @@ -72,7 +72,7 @@ if ($tg->WaitForFileTimed($daemon_base, $DC = $tg->CreateProcess ("$controller", "$common_args $start_args"); -$DC->SpawnWaitKill ($tg->ProcessStopWaitInterval ()); +$DC->SpawnWaitKill ($tg->ProcessStartWaitInterval ()); if ($tg->WaitForFileTimed($home_base, $tg->ProcessStartWaitInterval ()) == -1) { print STDERR "ERROR: Could not find home ior file <$home_ior>\n"; @@ -80,7 +80,7 @@ if ($tg->WaitForFileTimed($home_base, exit 1; } -$client = $CL->SpawnWaitKill ($tg->ProcessStopWaitInterval ()); +$client = $CL->SpawnWaitKill ($tg->ProcessStartWaitInterval ()); if ($client != 0) { print STDERR "ERROR: client returned $client\n"; @@ -91,7 +91,7 @@ if ($client != 0) { $DC = $tg->CreateProcess ("$controller", "$common_args $end_args"); -$ctrl = $DC->SpawnWaitKill ($tg->ProcessStopWaitInterval ()); +$ctrl = $DC->SpawnWaitKill ($tg->ProcessStartWaitInterval ()); if ($ctrl != 0) { print STDERR "ERROR: Fail to end component server\n"; $DC->Kill (); @@ -102,7 +102,7 @@ if ($ctrl != 0) { $DC = $tg->CreateProcess ("$controller", "$common_args $shutdown_args"); -$ctrl = $DC->SpawnWaitKill ($tg->ProcessStopWaitInterval ()); +$ctrl = $DC->SpawnWaitKill ($tg->ProcessStartWaitInterval ()); if ($ctrl != 0) { print STDERR "ERROR: Fail to shutdown CIAODaemon\n"; $DS->Kill (); diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl b/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl index f36ef2e64c7..0fc92ff22a1 100755 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl @@ -80,7 +80,7 @@ sleep (5); #Start the client to send the trigger message $CL = $tg->CreateProcess ("../RoundTripClient/client", ""); -$CL->SpawnWaitKill($tg->ProcessStopWaitInterval ()); +$CL->SpawnWaitKill($tg->ProcessStartWaitInterval ()); $AM->Kill (); $AD->Kill (); diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl b/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl index 896905c1659..06cc5d1ffc1 100755 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl @@ -64,7 +64,7 @@ sleep (5); #Start the client to send the trigger message $CL = $tg->CreateProcess ("../RoundTripClient/client", ""); -$CL->SpawnWaitKill($tg->ProcessStopWaitInterval ()); +$CL->SpawnWaitKill($tg->ProcessStartWaitInterval ()); $AM->Kill (); $AD->Kill (); diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl index f9ff6fa4e78..83251bcfee1 100755 --- a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl @@ -212,11 +212,18 @@ sleep (5); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); + +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl b/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl index 5568b429ada..6e6e913a1e2 100755 --- a/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl +++ b/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl @@ -272,7 +272,7 @@ sleep (5); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); |