summaryrefslogtreecommitdiff
path: root/TAO/examples
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples')
-rwxr-xr-xTAO/examples/POA/Adapter_Activator/run_test.pl2
-rwxr-xr-xTAO/examples/POA/Explicit_Activation/run_test.pl2
-rwxr-xr-xTAO/examples/POA/Forwarding/run_test.pl16
-rwxr-xr-xTAO/examples/POA/Loader/run_test.pl2
-rwxr-xr-xTAO/examples/POA/On_Demand_Activation/run_test.pl2
-rwxr-xr-xTAO/examples/POA/On_Demand_Loading/run_test.pl2
-rwxr-xr-xTAO/examples/POA/Reference_Counted_Servant/run_test.pl2
-rwxr-xr-xTAO/examples/Quoter/run_test.pl25
8 files changed, 27 insertions, 26 deletions
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index ad17a70c16d..18df6a4317a 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -73,4 +73,6 @@ unlink $iorfile_1;
unlink $iorfile_2;
unlink $iorfile_3;
+$SV->Wait ();
+
exit $status;
diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index ad17a70c16d..18df6a4317a 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -73,4 +73,6 @@ unlink $iorfile_1;
unlink $iorfile_2;
unlink $iorfile_3;
+$SV->Wait ();
+
exit $status;
diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl
index 92b58c93cb7..efcb22cad0a 100755
--- a/TAO/examples/POA/Forwarding/run_test.pl
+++ b/TAO/examples/POA/Forwarding/run_test.pl
@@ -15,19 +15,19 @@ $brace="\#\#\#\#\#";
# arrays
# Servers 1 and 2 are used in all tests
-@server1arglist = ("-o server1 -ORBport 10040 -ORBobjrefstyle url",
- "-p server1 -ORBport 10040 -ORBobjrefstyle url",
- "-o server1 -ORBport 10040 -ORBobjrefstyle url");
-@server2arglist = ("-f server1 -o server2 -ORBport 10041 -ORBobjrefstyle url",
- "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url",
- "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url");
+@server1arglist = ("-o server1",
+ "-p server1",
+ "-o server1");
+@server2arglist = ("-f server1 -o server2",
+ "-g server1 -p server2",
+ "-g server1 -p server2");
# The third server is only needed for the last test, but I'm making it
# a list in case anyone wants to run it in multiple tests, rather than
# just one
@server3arglist = ("",
"",
- "-f server2 -o server3 -ORBport 10043 -ORBobjrefstyle url");
+ "-f server2 -o server3");
# The client is run for all tests
@clientarglist = ("-f server2 -i 5",
@@ -109,7 +109,7 @@ sub run_test
if ($status != 0)
{
print STDERR ("\n$brace Test of $testtype FAILED\n");
- $retval = -1;
+ $status = -1;
}
else
{
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index 4961df7a72e..362b45423b0 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -68,4 +68,6 @@ $status = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $onew
unlink $iorfile_1;
unlink $iorfile_2;
+$SV->Wait ();
+
exit $status;
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index 4961df7a72e..362b45423b0 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -68,4 +68,6 @@ $status = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $onew
unlink $iorfile_1;
unlink $iorfile_2;
+$SV->Wait ();
+
exit $status;
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 4961df7a72e..362b45423b0 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -68,4 +68,6 @@ $status = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $onew
unlink $iorfile_1;
unlink $iorfile_2;
+$SV->Wait ();
+
exit $status;
diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
index 92d71a06ebd..ef98b4aae46 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -61,4 +61,6 @@ $status = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $onew
unlink $iorfile;
+$SV->Wait ();
+
exit $status;
diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl
index 681f6768bb6..2bdfdd0d488 100755
--- a/TAO/examples/Quoter/run_test.pl
+++ b/TAO/examples/Quoter/run_test.pl
@@ -22,22 +22,11 @@ $num_threads = 4;
$sleeptime = 2;
-# variables for parameters
-
-#$nsport = 20000 + uniqueid ();
-$nsport = 0;
-$clport = 0;
-$lcport = 0;
-$svport = 0;
-$ffport = 0;
-$gfport = 0;
-
# other variables
$n = 1;
$leave = 1;
$ior = 0;
-$done = "";
$debug = "";
$cm = "";
$sm = "";
@@ -56,7 +45,7 @@ sub read_nsior
sub name_server
{
- my $args = "$other -ORBport $nsport -ORBobjrefstyle url -o $nsiorfile";
+ my $args = "$other -o $nsiorfile";
my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR".
"Naming_Service$DIR_SEPARATOR".
"Naming_Service$Process::EXE_EXT";
@@ -66,7 +55,7 @@ sub name_server
sub lifecycle_server
{
- my $args = "$other -ORBport $lcport -ORBobjrefstyle url -ORBnameserviceior ".
+ my $args = "$other -ORBnameserviceior ".
"$ior -ORBsvcconf svc.conf";
my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR".
"LifeCycle_Service$DIR_SEPARATOR".
@@ -77,7 +66,7 @@ sub lifecycle_server
sub server
{
- my $args = "$other $debug $sm -ORBport $svport -ORBobjrefstyle url ".
+ my $args = "$other $debug $sm ".
"-ORBnameserviceior $ior -ORBsvcconf $s_conf";
$SV = Process::Create ("server$Process::EXE_EXT", $args);
@@ -85,7 +74,7 @@ sub server
sub factory_finder
{
- my $args = "$other -ORBport $ffport -ORBobjrefstyle url -ORBnameserviceior ".
+ my $args = "$other -ORBnameserviceior ".
"$ior -ORBsvcconf svc.conf";
$FF = Process::Create ("Factory_Finder".$Process::EXE_EXT, $args);
@@ -93,7 +82,7 @@ sub factory_finder
sub generic_factory
{
- my $args = "$other -l -ORBport $gfport -ORBobjrefstyle url -ORBnameserviceior ".
+ my $args = "$other -l -ORBnameserviceior ".
"$ior -ORBsvcconf svc.conf";
$GF = Process::Create ("Generic_Factory".$Process::EXE_EXT, $args);
@@ -101,8 +90,8 @@ sub generic_factory
sub client
{
- my $exe = "client$Process::EXE_EXT $other -l $debug $cm -ORBobjrefstyle url ".
- "-ORBport $clport -ORBnameserviceior $ior -ORBsvcconf $c_conf";
+ my $exe = "client$Process::EXE_EXT $other -l $debug $cm ".
+ "-ORBnameserviceior $ior -ORBsvcconf $c_conf";
for ($j = 0; $j < $n; $j++)
{
View Lorry Controller Status