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

1 files changed, 20 insertions, 3 deletions

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";