ChangeLogTag: Tue Apr 17 13:20:14 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 16 insertions, 4 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d3c8b174ed1..5afe4d167df 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 17 13:20:14 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl:
+
+          Added missing kill's for when things go wrong.
+
 Tue Apr 17 13:17:12 UTC 2007 Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_2768_Regression/server.cpp:
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
index 7082cdafd1d..e8c948ee90a 100755
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
@@ -30,14 +30,16 @@ $TAO_IMR->IgnoreExeSubDir(1);
 unlink($locior, $actior, $serverior);
 
 my $result = $IMR_LOCATOR->Spawn();
-if (PerlACE::waitforfile_timed($locior, 5) == -1) {
+if (PerlACE::waitforfile_timed($locior, 10) == -1) {
   print STDERR "ERROR: IMR Locator returned $result\n";
+  $IMR_LOCATOR->Kill();
   exit(1);
 }
 
 $result = $IMR_ACTIVATOR->Spawn();
-if (PerlACE::waitforfile_timed($actior, 5) == -1) {
+if (PerlACE::waitforfile_timed($actior, 10) == -1) {
   print STDERR "ERROR: IMR Activator returned $result\n";
+  $IMR_ACTIVATOR->Kill();
   $IMR_LOCATOR->Kill();
   exit(1);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
index 0d0cf689441..bfab5e7cec9 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl
@@ -47,7 +47,7 @@ $LM->Spawn ();
 
 if (PerlACE::waitforfile_timed ("lm.ior", 5) == -1) {
     print STDERR "ERROR: cannot find file LoadManager IOR: lm.ior\n";
-    $SV->Kill (); $SV->TimedWait (1);
+    $LM->Kill (); $LM->TimedWait (1);
     exit 1;
 }
 
@@ -55,6 +55,7 @@ $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
     print STDERR "ERROR: cannot find server file <$iorfile>\n";
+    $LM->Kill ();
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
index 34bf7617890..4c2da8b8cf0 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl
@@ -33,7 +33,7 @@ $LM->Spawn ();
 
 if (PerlACE::waitforfile_timed ("lm.ior", 5) == -1) {
     print STDERR "ERROR: cannot find file LoadManager IOR: lm.ior\n";
-    $SV->Kill (); $SV->TimedWait (1);
+    $LM->Kill (); $LM->TimedWait (1);
     exit 1;
 }
 
@@ -41,6 +41,7 @@ $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
     print STDERR "ERROR: cannot find server file <$iorfile>\n";
+    $LM->Kill ();
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
 }