summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorSon Dinh <dinhs@objectcomputing.com>2022-04-08 12:34:55 -0500
committerSon Dinh <dinhs@objectcomputing.com>2022-04-08 12:34:55 -0500
commit027700d2ee6d9c8265717e9d117ad87d43911d44 (patch)
treefbbad4bb78a44dcd217bef9992ce47192c42e124 /TAO
parentabd2964b279d3d54450750fc0359f4aad24d40a5 (diff)
downloadATCD-027700d2ee6d9c8265717e9d117ad87d43911d44.tar.gz
Update orbsvcs tests
Diffstat (limited to 'TAO')
-rwxr-xr-xTAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl6
-rwxr-xr-xTAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl4
-rwxr-xr-xTAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl2
4 files changed, 7 insertions, 7 deletions
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
index 16a49ae7da4..5d95c8c9c61 100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl
@@ -102,7 +102,7 @@ sub run_single {
$status = 1;
}
- $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval());
+ $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval(), {self_crash => 1});
if ($server1_status != 0) {
print STDERR "ERROR: server 1 returned $server_status\n";
@@ -183,14 +183,14 @@ sub run_merged {
$status = 1;
}
- $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval() + 5);
+ $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval() + 5, {self_crash => 1});
if ($server1_status != 0) {
print STDERR "ERROR: server 1 returned $server_status\n";
$status = 1;
}
- $server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval() + 5);
+ $server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval() + 5, {self_crash => 1});
if ($server_status != 0) {
print STDERR "ERROR: server 2 returned $server_status\n";
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
index 5b03a2c6a1d..0a37ebe4341 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
@@ -150,14 +150,14 @@ if ($client_status != 0) {
$status = 1;
}
-$server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval());
+$server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval(), {self_crash => 1});
if ($server_status < 0) {
print STDERR "ERROR: server 1 returned $server_status\n";
$status = 1;
}
-$server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval());
+$server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval(), {self_crash => 1});
if ($server_status < 0) {
print STDERR "ERROR: server 2 returned $server_status\n";
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
index 42309b06223..45db7ba8bed 100755
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
@@ -100,7 +100,7 @@ if ($client_status != 0) {
for ($i = 0; $i < $number_of_servers; $i++) {
- $server_status = $SV[$i]->WaitKill ($servers[$i]->ProcessStopWaitInterval());
+ $server_status = $SV[$i]->WaitKill ($servers[$i]->ProcessStopWaitInterval(), {self_crash => 1});
if ($server_status < 0) {
print STDERR "ERROR: server $i returned $server_status\n";
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
index 8e23518fce3..8bff03fe554 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl
@@ -282,7 +282,7 @@ sub shutdown_servers
last;
}
if (! $use_activator) {
- $SRV_status = $SRV[$i]->WaitKill($srv[$i]->ProcessStopWaitInterval());
+ $SRV_status = $SRV[$i]->WaitKill($srv[$i]->ProcessStopWaitInterval(), {self_crash => 1});
if ($SRV_status != 0) {
print STDERR "ERROR: server not shutdown correctly. It returned $SRV_status\n";
$status = 1;