More tests update

4 files changed, 11 insertions, 11 deletions

diff --git a/TAO/tests/Bug_1270_Regression/run_test.pl b/TAO/tests/Bug_1270_Regression/run_test.pl
index d22b33deb68..ece8ad06daa 100755
--- a/TAO/tests/Bug_1270_Regression/run_test.pl
+++ b/TAO/tests/Bug_1270_Regression/run_test.pl
@@ -108,27 +108,27 @@ while($elapsed < $max_running_time) {
         exit 1;
     }
 
-    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 45);
+    $client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
-        print STDERR "ERROR: client returned $client_status\n";
+        print STDERR "ERROR: client 1 returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
-        $CL1->Kill (); $CL1->TimedWait (1);
         $CL2->Kill (); $CL2->TimedWait (1);
+        $CL3->Kill (); $CL3->TimedWait (1);
         exit 1;
     }
 
-    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 45);
+    $client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
-        print STDERR "ERROR: client returned $client_status\n";
+        print STDERR "ERROR: client 2 returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
         $CL1->Kill (); $CL1->TimedWait (1);
-        $CL2->Kill (); $CL2->TimedWait (1);
+        $CL3->Kill (); $CL3->TimedWait (1);
         exit 1;
     }
 
-    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 45);
+    $client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 45, {self_crash => 1});
     if ($client_status != 0) {
-        print STDERR "ERROR: client returned $client_status\n";
+        print STDERR "ERROR: client 3 returned $client_status\n";
         $SV->Kill (); $SV->TimedWait (1);
         $CL1->Kill (); $CL1->TimedWait (1);
         $CL2->Kill (); $CL2->TimedWait (1);
diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl
index 3052bf9f396..f32e3ddfda9 100755
--- a/TAO/tests/Bug_1361_Regression/run_test.pl
+++ b/TAO/tests/Bug_1361_Regression/run_test.pl
@@ -90,7 +90,7 @@ while (($elapsed < $max_running_time) ) {
     }
 
     if ($client_status == 0) {
-        $CL->WaitKill($client->ProcessStartWaitInterval() + 75);
+        $CL->WaitKill($client->ProcessStartWaitInterval() + 75, {self_crash => 1});
         if ($client_status != 0) {
             print STDERR "ERROR: client returned $client_status\n";
             $status = 1;
diff --git a/TAO/tests/Crash_On_Write/run_test.pl b/TAO/tests/Crash_On_Write/run_test.pl
index 86384663bc1..b72ebdd495d 100755
--- a/TAO/tests/Crash_On_Write/run_test.pl
+++ b/TAO/tests/Crash_On_Write/run_test.pl
@@ -63,7 +63,7 @@ if ($client_status != 0) {
 
 # The server crashes, therefore it normally exists with status != 0,
 # but a status of -1 would be a serious error.
-$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 50);
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 50, {self_crash => 1});
 
 if ($server_status == -1) {
     print STDERR "ERROR: server returned $server_status\n";
diff --git a/TAO/tests/DII_Deferred_Transient/run_test.pl b/TAO/tests/DII_Deferred_Transient/run_test.pl
index 80bc1ae58b1..7c8532e2dd6 100755
--- a/TAO/tests/DII_Deferred_Transient/run_test.pl
+++ b/TAO/tests/DII_Deferred_Transient/run_test.pl
@@ -59,7 +59,7 @@ if ($client_status != 0) {
     $status = 1;
 }
 
-$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval(), {self_crash => 1});
 
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";