summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-18 04:16:40 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-18 04:16:40 +0000
commitb8d7a1bb1a03071e3ad13561c481af8f6602a328 (patch)
tree2316d6b0fa13d9b158e04976aa2902245c7ea5ca
parentec5110852e445b4156a36b0fce5cc14c22fffa6a (diff)
downloadATCD-b8d7a1bb1a03071e3ad13561c481af8f6602a328.tar.gz
*** empty log message ***
-rwxr-xr-xTAO/examples/POA/Adapter_Activator/run_test.pl11
-rwxr-xr-xTAO/examples/POA/Explicit_Activation/run_test.pl14
-rwxr-xr-xTAO/examples/POA/Loader/run_test.pl6
-rwxr-xr-xTAO/examples/POA/On_Demand_Activation/run_test.pl9
-rwxr-xr-xTAO/examples/POA/On_Demand_Loading/run_test.pl6
5 files changed, 22 insertions, 24 deletions
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index e32984f14e0..f733ce5e7e2 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -80,11 +80,6 @@ if (ACE::waitforfile_timed ($iorfile_3, 5) == -1) {
$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
" $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
- " $extra_args $oneway -i $iterations -f $iorfile_2");
-$CL_3 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
- " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
-
$client_1 = $CL_1->TimedWait (60);
if ($client_1 == -1) {
@@ -92,12 +87,18 @@ if ($client_1 == -1) {
$CL_1->Kill (); $CL_1->TimedWait (1);
}
+$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+ " $extra_args $oneway -i $iterations -f $iorfile_2");
+
$client_2 = $CL_2->TimedWait (60);
if ($client_2 == -1) {
print STDERR "ERROR: client 2 timedout\n";
$CL_2->Kill (); $CL_2->TimedWait (1);
}
+$CL_3 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+ " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
+
$client_3 = $CL_3->TimedWait (60);
if ($client_3 == -1) {
print STDERR "ERROR: client 3 timedout\n";
diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index 4036059e83f..08eefc438a7 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -82,11 +82,6 @@ if (ACE::waitforfile_timed ($iorfile_3, 5) == -1) {
$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
" $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
- " $extra_args $oneway -i $iterations -f $iorfile_2");
-$CL_3 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
- " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
-
$client_1 = $CL_1->TimedWait (60);
if ($client_1 == -1) {
@@ -94,19 +89,24 @@ if ($client_1 == -1) {
$CL_1->Kill (); $CL_1->TimedWait (1);
}
+$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+ " $extra_args $oneway -i $iterations -f $iorfile_2");
+
$client_2 = $CL_2->TimedWait (60);
if ($client_2 == -1) {
print STDERR "ERROR: client 2 timedout\n";
$CL_2->Kill (); $CL_2->TimedWait (1);
}
+$CL_3 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+ " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
+
$client_3 = $CL_3->TimedWait (60);
if ($client_3 == -1) {
print STDERR "ERROR: client 3 timedout\n";
$CL_3->Kill (); $CL_3->TimedWait (1);
}
-
$server = $SV->TimedWait (5);
if ($server == -1) {
print STDERR "ERROR: server timedout\n";
@@ -126,5 +126,3 @@ if ($server != 0 ||
}
exit 0;
-
-
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index 29e7c37c12c..a849b92bac7 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -74,9 +74,6 @@ if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
" $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
- " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
-
$client_1 = $CL_1->TimedWait (60);
if ($client_1 == -1) {
@@ -84,6 +81,9 @@ if ($client_1 == -1) {
$CL_1->Kill (); $CL_1->TimedWait (1);
}
+$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+ " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
+
$client_2 = $CL_2->TimedWait (60);
if ($client_2 == -1){
print STDERR "ERROR: client 2 timedout\n";
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index b0f60b06aae..06851386ac1 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -73,22 +73,22 @@ if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
"$extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
- "$extra_args $oneway -i $iterations -f $iorfile_2 -x");
-
$client_1 = $CL_1->TimedWait (60);
if ($client_1 == -1) {
print STDERR "ERROR: client 1 timedout\n";
$CL_1->Kill (); $CL_1->TimedWait (1);
}
+
+$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+ "$extra_args $oneway -i $iterations -f $iorfile_2 -x");
+
$client_2 = $CL_2->TimedWait (60);
if ($client_2 == -1) {
print STDERR "ERROR: client 2 timedout\n";
$CL_2->Kill (); $CL_2->TimedWait (1);
}
-
$server = $SV->TimedWait (5);
if ($server == -1) {
print STDERR "ERROR: server timedout\n";
@@ -103,4 +103,3 @@ if ($server != 0 || $client_1 != 0 || $client_2 != 0){
}
exit 0;
-
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index a16a69cc5c1..bf85c60de93 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -75,8 +75,6 @@ if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
" $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
- " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
$client_1 = $CL_1->TimedWait (60);
if ($client_1 == -1) {
@@ -84,6 +82,9 @@ if ($client_1 == -1) {
$CL_1->Kill (); $CL_1->TimedWait (1);
}
+$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+ " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
+
$client_2 = $CL_2->TimedWait (60);
if ($client_2 == -1) {
print STDERR "ERROR: client 2 timedout\n";
@@ -104,4 +105,3 @@ if ($server != 0 || $client_1 != 0 || $client_2 != 0) {
}
exit 0;
-