7 files changed, 20 insertions, 8 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;