diff options
38 files changed, 701 insertions, 112 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index add7a717a8e..3bd9a40d00a 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,50 @@ +Thu Dec 31 12:40:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/ami4ccm/examples/Hello/descriptors/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_5_to_5.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/tests/CSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp + * 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/PSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl + * connectors/dds4ccm/tests/SetConnectorAttributes/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/State_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl + Check return value of the plan and execution manager + + * DAnCE/Deployment/Module_Main.h: + Always destroy the orb + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + Layout changes + + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: + Rethrow the exception so that we don't fail silently + Wed Dec 30 12:58:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl diff --git a/CIAO/DAnCE/Deployment/Module_Main.h b/CIAO/DAnCE/Deployment/Module_Main.h index b4f3ac01040..35b4ba4336d 100644 --- a/CIAO/DAnCE/Deployment/Module_Main.h +++ b/CIAO/DAnCE/Deployment/Module_Main.h @@ -55,6 +55,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) CORBA::Object_var obj = module_instance.create_object (orb.in (), argc, argv); + #ifndef DANCE_MODULE_MAIN_SKIP_ORB_RUN if (!CORBA::is_nil (obj.in ())) { @@ -63,15 +64,14 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) else { DANCE_ERROR (1, (LM_ERROR, DLINFO - ACE_TEXT("Module_Main.h - No object created.\n"))); + ACE_TEXT("Module_Main.h - Error: No object created.\n"))); retval = -1; } - DANCE_DEBUG (6, (LM_TRACE, DLINFO ACE_TEXT("Module_Main.h - ORB event loop finished, exiting.\n"))); +#endif orb->destroy (); -#endif } catch (const CORBA::Exception& ex) { @@ -80,7 +80,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) } catch (...) { - DANCE_ERROR (1, (LM_ERROR, "Module_Main.h - Unknown exception.\n")); + DANCE_ERROR (1, (LM_ERROR, "Module_Main.h - Error: Unknown exception.\n")); retval = -1; } diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp index 0abc59d555c..567d2f19c29 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -92,6 +92,7 @@ void Plan_Launcher_Impl::execute() this->write_cdr_plan_file(this->cdr_dest_url_.c_str(), plan); } } + void Plan_Launcher_Impl::stop_plan() { DANCE_TRACE ("Plan_Launcher_Impl::stop_plan"); diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp index ecd592716a9..50dc7a0e421 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp @@ -35,21 +35,24 @@ DAnCE_Plan_Launcher_Module::create_object (CORBA::ORB_ptr orb, catch (const Plan_Launcher_Base_Impl::Deployment_Failure& e) { DANCE_ERROR (1, (LM_ERROR, DLINFO - ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") - ACE_TEXT("Error : %C.\n"), e.error_.c_str())); + ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") + ACE_TEXT("Error : %C.\n"), e.error_.c_str())); + throw; } catch (const CORBA::Exception& ex) { DANCE_ERROR (1, (LM_ERROR, DLINFO - ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") - ACE_TEXT("Caught CORBA Exception %C\n"), - ex._info ().c_str ())); + ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") + ACE_TEXT("Caught CORBA Exception %C\n"), + ex._info ().c_str ())); + throw; } catch (...) { DANCE_ERROR (1, (LM_ERROR, DLINFO - ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") - ACE_TEXT("Unknown exception.\n"))); + ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ") + ACE_TEXT("Unknown exception.\n"))); + throw; } return CORBA::Object::_nil (); } diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl index 96224f5d81e..041f168d36e 100755 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl @@ -169,7 +169,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -187,7 +192,14 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -207,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl index cb10495c028..af85ba629d3 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 @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], 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 3fc4d0cbb3c..bb8bb09739c 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 @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl index 72da2455e83..29bc9885155 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl @@ -172,7 +172,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -190,12 +195,18 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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 "Start dance_plan_launcher.exe with -x $cdp_file_two -k file://$ior_emfile\n"; $E2 = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file_two -k file://$ior_emfile"); -$E2->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); +$E2->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl index ee0ddd9db89..c35316bd647 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl index de786bcaace..4f71db80fba 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl index 165a7d0024a..e4ed46cb1bb 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,7 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); +$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); 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 21ae0751645..9a86be87d30 100755 --- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl index 61ec9e59859..7eeaf94a079 100755 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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 3c85e596468..228b8c586c1 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl index 3c85e596468..228b8c586c1 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl index 3c85e596468..228b8c586c1 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl index 3c85e596468..228b8c586c1 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl index 3c85e596468..228b8c586c1 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 @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp index 7054c2967fe..55d851da9c5 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp @@ -146,8 +146,8 @@ namespace CIAO_Getter_Test_Receiver_Impl this->getter_->time_out ().sec, this->getter_->time_out ().nanosec)); - GetterTest_Seq *gettertest_seq; - ::CCM_DDS::ReadInfoSeq *readinfo; + GetterTest_Seq *gettertest_seq = 0; + ::CCM_DDS::ReadInfoSeq *readinfo = 0; bool result = this->getter_->get_many (gettertest_seq, readinfo); if (result) { @@ -320,7 +320,7 @@ namespace CIAO_Getter_Test_Receiver_Impl "Expected to return no data.\n")); } } - catch (const CCM_DDS::InternalError& ) + catch (const CCM_DDS::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: " "Caught unexcepted InternalError " diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl index a860ac5e5dd..4850e423f01 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl @@ -169,8 +169,13 @@ $daemons_running = 1; # Invoke execution manager. print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,19 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +225,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl index 73c1463f353..c7028573c7f 100755 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl index 73c1463f353..c7028573c7f 100755 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl index 7b4e7ddac5a..94baa8b6dbd 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl index 3c85e596468..228b8c586c1 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl index 7b4e7ddac5a..94baa8b6dbd 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl index 3b72c2e4341..7740ff9b7b8 100755 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl index 3c64f8486d7..b76bdea8d09 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,7 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ()); +$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); print "Executor returned.\n"; print "Shutting down rest of the processes.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl index 8c6e6ae84cc..11da7230a15 100755 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl index 3c85e596468..228b8c586c1 100755 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl index a860ac5e5dd..7518a67bdb3 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl index 8c6e6ae84cc..11da7230a15 100755 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl index 8c6e6ae84cc..11da7230a15 100755 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl index 8c6e6ae84cc..11da7230a15 100755 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl index 3b72c2e4341..7740ff9b7b8 100755 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl index 3c85e596468..228b8c586c1 100755 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl index 73c1463f353..c7028573c7f 100755 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl index 97cff4d130d..62b7a8c8687 100755 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl index 61ec9e59859..7eeaf94a079 100755 --- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl @@ -170,7 +170,12 @@ $daemons_running = 1; print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$EM->Spawn (); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} if ($tg_exe_man->WaitForFileTimed ($ior_embase, $tg_exe_man->ProcessStartWaitInterval ()) == -1) { @@ -188,7 +193,13 @@ print "Invoking executor - launch the application -\n"; print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-x $cdp_file -k file://$ior_emfile"); -$E->SpawnWaitKill (3 * $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; +} for ($i = 0; $i < $nr_daemon; ++$i) { if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], @@ -208,7 +219,13 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -q"); -$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"; |