Fri Dec 11 12:27:25 UTC 2009 Denis Budko <denis.budko@remedy.nl>

        * orbsvcs/tests/Bug_2285_Regression/run_test2.pl:
        * orbsvcs/tests/Bug_2285_Regression/server2.cpp:
        * orbsvcs/tests/Notify/Ordering/run_test.pl:
        * orbsvcs/tests/Notify/MC/run_test.pl:
        * orbsvcs/tests/Notify/Discarding/run_test.pl:
        * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
        * orbsvcs/tests/ImplRepo/run_test.pl:
        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
        * orbsvcs/tests/Bug_2248_Regression/run_test.pl:
        * tests/AlternateIIOP/run_test.pl:
        * examples/Load_Balancing/run_test.pl:

          Tests are converted to use new test framework
          and added to fuzz build.

13 files changed, 193 insertions, 213 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b208e4975c2..2445eb1a20f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Fri Dec 11 12:27:25 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
+
+        * orbsvcs/tests/Bug_2285_Regression/run_test2.pl:
+        * orbsvcs/tests/Bug_2285_Regression/server2.cpp:
+        * orbsvcs/tests/Notify/Ordering/run_test.pl:
+        * orbsvcs/tests/Notify/MC/run_test.pl:
+        * orbsvcs/tests/Notify/Discarding/run_test.pl:
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
+        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/run_test.pl:
+        * tests/AlternateIIOP/run_test.pl:
+        * examples/Load_Balancing/run_test.pl:
+
+          Tests are converted to use new test framework
+          and added to fuzz build.
+
 Fri Dec 11 09:58:33 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
 
         * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl:
diff --git a/TAO/examples/Load_Balancing/run_test.pl b/TAO/examples/Load_Balancing/run_test.pl
index 979b57d8d98..d2cbaf69fdb 100755
--- a/TAO/examples/Load_Balancing/run_test.pl
+++ b/TAO/examples/Load_Balancing/run_test.pl
@@ -43,10 +43,10 @@ if ($balancer_status != 0) {
     exit 1;
 }
 
-if ($server->WaitForFileTimed ($iorbase,
-                               $server->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
+if ($balancer->WaitForFileTimed ($iorbase,
+                                 $balancer->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$balancer_iorfile>\n";
+    $LB->Kill (); $LB->TimedWait (1);
     exit 1;
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
index a9ede9d1dad..3f639ba1591 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
@@ -153,14 +153,14 @@ if ($client_status != 0) {
 
 $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval());
 
-if ($server_status != 0) {
+if ($server_status < 0) {
     print STDERR "ERROR: server 1 returned $server_status\n";
     $status = 1;
 }
 
 $server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval());
 
-if ($server_status != 0) {
+if ($server_status < 0) {
     print STDERR "ERROR: server 2 returned $server_status\n";
     $status = 1;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index ca7d5a28208..59feb7de5cb 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -67,14 +67,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
-        return 1;
+        return -1;
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
+                          -1);
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in ());
@@ -122,7 +122,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing IOR: %s",
                                ior_output_file),
-                              1);
+                              -1);
           ACE_OS::fprintf (output_file, "%s", ior.in ());
           ACE_OS::fclose (output_file);
       }
@@ -150,7 +150,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Caught exception:");
-      return 1;
+      return -1;
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
index bb776f3d445..8fd2f4fe3f6 100755
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
@@ -103,7 +103,7 @@ if ($client_status != 0) {
 for ($i = 0; $i < $number_of_servers; $i++) {
     $server_status = $SV[$i]->WaitKill ($servers[$i]->ProcessStopWaitInterval());
 
-    if ($server_status != 0) {
+    if ($server_status < 0) {
         print STDERR "ERROR: server $i returned $server_status\n";
         $status = 1;
     }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index c416ecf08d2..55ce7d5c579 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -77,7 +77,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
+                          -1);
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -105,12 +105,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
       if (parse_args (argc, argv) != 0)
-        return 1;
+        return -1;
 
       Hello *hello_impl = 0;
       ACE_NEW_RETURN (hello_impl,
                       Hello (orb.in (), Test::Hello::_nil (), my_id_number),
-                      1);
+                      -1);
       PortableServer::ServantBase_var owner (hello_impl);
 
       PortableServer::ObjectId_var server_id =
@@ -131,7 +131,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s\n",
                            ior_output_file),
-                           1);
+                           -1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
@@ -146,7 +146,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught:");
-      return 1;
+      return -1;
     }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
index 3b807872726..be6c0529a55 100755
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl
@@ -53,10 +53,10 @@ $CLI = $cli->CreateProcess ("client",
 $SRV = $srv->CreateProcess ("server");
 
 my $server_cmd = $SRV->Executable();
-#my $srv_server_cmd = $imr->LocalFile ($server_cmd);
+my $srv_server_cmd = $imr->LocalFile ($server_cmd);
 
 $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". 
-                "add test_server -c \" $server_cmd ".
+                "add test_server -c \"$srv_server_cmd ".
                 "-ORBInitRef ImplRepoService=file://$imr_imriorfile ".
                 "-ORBUseIMR 1 ".
                 "-o $srv_srviorfile\"");
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index fbe761e9dac..5cfc27fd95a 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -44,7 +44,7 @@ $ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator");
 
 $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service");
 my $ns_cmd = $NS->Executable();
-#my $ns_ns_cmd = $imr->LocalFile ($ns_cmd);
+my $ns_ns_cmd = $imr->LocalFile ($ns_cmd);
 
 $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr");
 # We want the tao_imr executable to be found exactly in the path
@@ -116,10 +116,9 @@ if ($act->WaitForFileTimed ($actiorfile,$act->ProcessStartWaitInterval()) == -1)
 ## Register the NameService
 
 $TI->Arguments("-ORBInitRef ImplRepoService=file://$ti_imriorfile"
-                . " add NameService "
-                ." -c \" $ns_cmd" 
-                ." -ORBInitRef ImplRepoService=file://$imr_imriorfile"
-                ." -ORBUseIMR 1 .\"");
+               . " add NameService -c \""
+               . "$ns_ns_cmd -ORBInitRef ImplRepoService=file://$imr_imriorfile -ORBUseIMR 1"
+               . "\"");
 
 $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()+45);
 if ($TI_status != 0) {
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index 7a34d2f61c2..ae092317ac9 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -214,9 +214,8 @@ sub nt_service_test_i
     system("net start taoimractivator 2>&1");
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
-    $TI->Arguments ("$imr_initref add airplane_server -c \""
-                         . $imr_A_SRV_cmd.
-                         "\" -w \"$ENV{ACE_ROOT}/lib\"");
+    $TI->Arguments ("$imr_initref add airplane_server -c \"$imr_A_SRV_cmd\" ".
+                    "-w \"$ENV{ACE_ROOT}/lib\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr add airplane_server returned $TI_status\n";
@@ -412,9 +411,7 @@ sub airplane_ir_test
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     # Can use update to add servers.
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "update airplane_server -c \" ".
-                    $imr_A_SRV_cmd.
-                    " -o $imr_airplaneiorfile \"");
+                    "update airplane_server -c \"$imr_A_SRV_cmd -o $imr_airplaneiorfile\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr returned $TI_status\n";
@@ -639,9 +636,8 @@ sub nestea_ir_test
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TI->Arguments ("-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                         "update nestea_server -l $imr_host -c \"".
-                         $imr_N_SRV_cmd.
-                         " -o $imr_nesteaiorfile\"");
+                    "update nestea_server -l $imr_host ".
+                    "-c \"$imr_N_SRV_cmd -o $imr_nesteaiorfile\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr returned $TI_status\n";
@@ -677,9 +673,7 @@ sub nestea_ir_test
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TI->Arguments ("-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                         "add nestea_server -c \"".
-                         $imr_N_SRV_cmd.
-                         " -o $imr_nesteaiorfile\"");
+                    "add nestea_server -c \"$imr_N_SRV_cmd -o $imr_nesteaiorfile\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr 1 returned $TI_status\n";
@@ -791,9 +785,8 @@ sub perclient
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TI->Arguments ("-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "add nestea_server -a PER_CLIENT -c \"".
-                    $imr_N_SRV_cmd.
-                    " -o $imr_nesteaiorfile\"");
+                    "add nestea_server -a PER_CLIENT ".
+                    "-c \"$imr_N_SRV_cmd -o $imr_nesteaiorfile\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr returned $TI_status\n";
@@ -1081,8 +1074,7 @@ sub persistent_ir_test
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                         "add airplane_server -c \"".
-                         '\"' . $imr_P_SRV_cmd. '\"' . "\" " . $refstyle);
+                    "add airplane_server -c \"\\\"$imr_P_SRV_cmd\\\" $refstyle\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr returned $TI_status\n";
@@ -1346,9 +1338,7 @@ sub both_ir_test
     ## may attempt to use a partially written file.
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "add nestea_server -c \" ".
-                    $imr_N_SRV_cmd.
-                    " $refstyle\"");
+                    "add nestea_server -c \"$imr_N_SRV_cmd $refstyle\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr returned $TI_status\n";
@@ -1359,9 +1349,7 @@ sub both_ir_test
 
     # No need to specify imr_initref or -orbuseimr 1 for servers spawned by activator
     $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ".
-                    "add airplane_server -c \" ".
-                    $imr_A_SRV_cmd.
-                    " $refstyle\"");
+                    "add airplane_server -c \"$imr_A_SRV_cmd $refstyle\"");
     $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval());
     if ($TI_status != 0) {
         print STDERR "ERROR: tao_imr returned $TI_status\n";
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
index 020551570b1..d845bcd2de5 100755
--- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
@@ -24,8 +24,6 @@ my $stc = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\
 my $ses = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n";
 my $sec = PerlACE::TestTarget::create_target (6) || die "Create target 6 failed\n";
 
-$ns->AddLibPath ('../lib');
-$nfs->AddLibPath ('../lib');
 $sts->AddLibPath ('../lib');
 $stc->AddLibPath ('../lib');
 $ses->AddLibPath ('../lib');
@@ -37,28 +35,24 @@ $port = $ns->RandomPort ();
 $host = $ns->HostName ();
 $deadline = 0;
 
-$supiorfile = "supplier.ior";
+$iorbase = "supplier.ior";
 $nfsiorfile = "notify.ior";
 $nsiorfile = "naming.ior";
 $nfsconffile = "notify$PerlACE::svcconf_ext";
 
 my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 my $nfs_nfsiorfile = $nfs->LocalFile ($nfsiorfile);
-my $sts_stsiorfile = $sts->LocalFile ($supiorfile);
-my $stc_stsiorfile = $stc->LocalFile ($supiorfile);
-my $sec_stsiorfile = $sec->LocalFile ($supiorfile);
-my $ses_sesiorfile = $ses->LocalFile ($supiorfile);
-my $sec_sesiorfile = $sec->LocalFile ($supiorfile);
-my $stc_sesiorfile = $stc->LocalFile ($supiorfile);
+my $sts_iorfile = $sts->LocalFile ($iorbase);
+my $stc_iorfile = $stc->LocalFile ($iorbase);
+my $sec_iorfile = $sec->LocalFile ($iorbase);
+my $ses_iorfile = $ses->LocalFile ($iorbase);
 my $nfs_nfsconffile = $nfs->LocalFile ($nfsconffile);
 $ns->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
-$sts->DeleteFile ($stsiorfile);
-$stc->DeleteFile ($stsiorfile);
-$sec->DeleteFile ($stsiorfile);
-$ses->DeleteFile ($sesiorfile);
-$sec->DeleteFile ($sesiorfile);
-$stc->DeleteFile ($sesiorfile);
+$sts->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
+$sec->DeleteFile ($iorbase);
+$ses->DeleteFile ($iorbase);
 
 foreach my $arg (@ARGV) {
     if ($arg eq "-d") {
@@ -72,8 +66,7 @@ foreach my $arg (@ARGV) {
 }
 
 $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
-                            "-ORBEndpoint iiop://$host:$port ".
-                            "-o $ns_nsiorfile");
+                          "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile");
 
 $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
                             "-ORBInitRef NameService=iioploc://" .
@@ -85,7 +78,7 @@ $STS = $sts->CreateProcess ("Structured_Supplier",
                             "-ORBDebugLevel $debug_level ".
                             "-ORBInitRef NameService=iioploc://".
                             "$host:$port/NameService ".
-                            "-o $sts_stsiorfile");
+                            "-o $sts_iorfile");
 
 $STC = $stc->CreateProcess ("Structured_Consumer");
 
@@ -93,13 +86,11 @@ $SES = $ses->CreateProcess ("Sequence_Supplier",
                             "-ORBDebugLevel $debug_level ".
                             "-ORBInitRef NameService=iioploc://".
                             "$host:$port/NameService ".
-                            "-o $ses_sesiorfile");
+                            "-o $ses_iorfile");
 
 $SEC = $sec->CreateProcess ("Sequence_Consumer");
 
-$CLI_args = "-ORBInitRef NameService=iioploc://".
-            "$host:$port/NameService ";
-
+$CLI_args = "-ORBInitRef NameService=iioploc://$host:$port/NameService ";
 
 
 $NS_status = $NS->Spawn ();
@@ -144,27 +135,27 @@ if ($status == 0) {
             $status = 1;
             last;
         }
-        if ($sts->WaitForFileTimed ($stsiorfile,$sts->ProcessStartWaitInterval()) == -1) {
-            print STDERR "ERROR: cannot find file <$sts_stsiorfile>\n";
+        if ($sts->WaitForFileTimed ($iorbase,$sts->ProcessStartWaitInterval()) == -1) {
+            print STDERR "ERROR: cannot1 find file <$sts_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
-           $status = 1;
-           last;
+            $status = 1;
+            last;
         }
-        if ($sts->GetFile ($stsiorfile) == -1) {
-            print STDERR "ERROR: cannot retrieve file <$sts_stsiorfile>\n";
+        if ($sts->GetFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot retrieve file <$sts_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
-        if ($stc->PutFile ($stsiorfile) == -1) {
-            print STDERR "ERROR: cannot set file <$stc_stsiorfile>\n";
+        if ($stc->PutFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot set file <$stc_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
         sleep 2;
 
-        $STC->Arguments($CLI_args . " -k file://$stc_stsiorfile  -d $discard_policy");
+        $STC->Arguments($CLI_args . " -k file://$stc_iorfile -d $discard_policy");
         $STC_status = $STC->SpawnWaitKill ($stc->ProcessStartWaitInterval()+5);
         if ($STC_status != 0) {
             print STDERR "ERROR: Structured Consumer returned $STC_status\n";
@@ -180,12 +171,12 @@ if ($status == 0) {
             last;
         }
 
-        $sts->DeleteFile ($stsiorfile);
-        $stc->DeleteFile ($stsiorfile);
+        $sts->DeleteFile ($iorbase);
+        $stc->DeleteFile ($iorbase);
     }
 }
-$sts->DeleteFile ($stsiorfile);
-$stc->DeleteFile ($stsiorfile);
+$sts->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
 
 if ($status == 0) {
     for($i = 0; $i <= $#policies; $i++) {
@@ -200,27 +191,27 @@ if ($status == 0) {
             $status = 1;
             last;
         }
-        if ($sts->WaitForFileTimed ($stsiorfile,$sts->ProcessStartWaitInterval()) == -1) {
-             print STDERR "ERROR: cannot find file <$sts_stsiorfile>\n";
+        if ($sts->WaitForFileTimed ($iorbase,$sts->ProcessStartWaitInterval()) == -1) {
+             print STDERR "ERROR: cannot find file <$sts_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
-        if ($sts->GetFile ($stsiorfile) == -1) {
-            print STDERR "ERROR: cannot retrieve file <$sts_stsiorfile>\n";
+        if ($sts->GetFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot retrieve file <$sts_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
-        if ($sec->PutFile ($stsiorfile) == -1) {
-            print STDERR "ERROR: cannot set file <$sec_stsiorfile>\n";
+        if ($sec->PutFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot set file <$sec_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
         sleep 2;
 
-        $SEC->Arguments($CLI_args . " -k file://$sec_stsiorfile -d $discard_policy");
+        $SEC->Arguments($CLI_args . " -k file://$sec_iorfile -d $discard_policy");
         $SEC_status = $SEC->SpawnWaitKill ($sec->ProcessStartWaitInterval()+5);
         if ($SEC_status != 0) {
              print STDERR "ERROR: Sequence Consumer returned $SEC_status\n";
@@ -236,12 +227,12 @@ if ($status == 0) {
             last;
         }
 
-        $sts->DeleteFile ($stsiorfile);
-        $sec->DeleteFile ($stsiorfile);
+        $sts->DeleteFile ($iorbase);
+        $sec->DeleteFile ($iorbase);
     }
 }
-$sts->DeleteFile ($stsiorfile);
-$sec->DeleteFile ($stsiorfile);
+$sts->DeleteFile ($iorbase);
+$sec->DeleteFile ($iorbase);
 
 if ($status == 0) {
     for($i = 0; $i <= $#policies; $i++) {
@@ -256,27 +247,27 @@ if ($status == 0) {
             $status = 1;
             last;
         }
-        if ($ses->WaitForFileTimed ($sesiorfile,$ses->ProcessStartWaitInterval()) == -1) {
-            print STDERR "ERROR: cannot find file <$ses_sesiorfile>\n";
+        if ($ses->WaitForFileTimed ($iorbase,$ses->ProcessStartWaitInterval()) == -1) {
+            print STDERR "ERROR: cannot find file <$ses_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
-        if ($ses->GetFile ($sesiorfile) == -1) {
-            print STDERR "ERROR: cannot retrieve file <$ses_sesiorfile>\n";
+        if ($ses->GetFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot retrieve file <$ses_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
-        if ($sec->PutFile ($sesiorfile) == -1) {
-            print STDERR "ERROR: cannot set file <$sec_sesiorfile>\n";
+        if ($sec->PutFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot set file <$sec_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
         sleep 2;
 
-        $SEC->Arguments($CLI_args . " -k file://$sec_sesiorfile -d $discard_policy");
+        $SEC->Arguments($CLI_args . " -k file://$sec_iorfile -d $discard_policy");
         $SEC_status = $SEC->SpawnWaitKill ($sec->ProcessStartWaitInterval()+5);
         if ($SEC_status != 0) {
             print STDERR "ERROR: Sequence Consumer returned $SEC_status\n";
@@ -292,12 +283,12 @@ if ($status == 0) {
             last;
         }
 
-        $ses->DeleteFile ($sesiorfile);
-        $sec->DeleteFile ($sesiorfile);
+        $ses->DeleteFile ($iorbase);
+        $sec->DeleteFile ($iorbase);
     }
 }
-$ses->DeleteFile ($sesiorfile);
-$sec->DeleteFile ($sesiorfile);
+$ses->DeleteFile ($iorbase);
+$sec->DeleteFile ($iorbase);
 
 if ($status == 0) {
     for($i = 0; $i <= $#policies; $i++) {
@@ -312,27 +303,27 @@ if ($status == 0) {
             $status = 1;
             last;
         }
-        if ($ses->WaitForFileTimed ($sesiorfile,$ses->ProcessStartWaitInterval()) == -1) {
-            print STDERR "ERROR: cannot find file <$ses_sesiorfile>\n";
+        if ($ses->WaitForFileTimed ($iorbase,$ses->ProcessStartWaitInterval()) == -1) {
+            print STDERR "ERROR: cannot find file <$ses_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
-        if ($ses->GetFile ($sesiorfile) == -1) {
-            print STDERR "ERROR: cannot retrieve file <$ses_sesiorfile>\n";
+        if ($ses->GetFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot retrieve file <$ses_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
-        if ($stc->PutFile ($sesiorfile) == -1) {
-            print STDERR "ERROR: cannot set file <$stc_sesiorfile>\n";
+        if ($stc->PutFile ($iorbase) == -1) {
+            print STDERR "ERROR: cannot set file <$stc_iorfile>\n";
             $STS->Kill (); $STS->TimedWait (1);
             $status = 1;
             last;
         }
         sleep 2;
 
-        $STC->Arguments($CLI_args . " -k file://$stc_sesiorfile  -d $discard_policy");
+        $STC->Arguments($CLI_args . " -k file://$stc_iorfile  -d $discard_policy");
         $STC_status = $STC->SpawnWaitKill ($stc->ProcessStartWaitInterval()+5);
         if ($STC_status != 0) {
             print STDERR "ERROR: Structured Consumer returned $STC_status\n";
@@ -346,8 +337,8 @@ if ($status == 0) {
             $status = 1;
             last;
         }
-        $ses->DeleteFile ($sesiorfile);
-        $stc->DeleteFile ($sesiorfile);
+        $ses->DeleteFile ($iorbase);
+        $stc->DeleteFile ($iorbase);
     }
 }
 
@@ -365,11 +356,9 @@ if ($NS_status != 0) {
 
 $ns->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
-$sts->DeleteFile ($stsiorfile);
-$stc->DeleteFile ($stsiorfile);
-$sec->DeleteFile ($stsiorfile);
-$ses->DeleteFile ($sesiorfile);
-$sec->DeleteFile ($sesiorfile);
-$stc->DeleteFile ($sesiorfile);
+$sts->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
+$sec->DeleteFile ($iorbase);
+$ses->DeleteFile ($iorbase);
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl
index dc40c74cd53..fd5d46ad8ba 100755
--- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl
@@ -23,8 +23,6 @@ my $mon = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\
 my $sup = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n";
 my $con = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n";
 
-$ns->AddLibPath ('../lib');
-$nfs->AddLibPath ('../lib');
 $mon->AddLibPath ('../lib');
 $sup->AddLibPath ('../lib');
 $con->AddLibPath ('../lib');
@@ -35,8 +33,7 @@ PerlACE::check_privilege_group();
 my $static_build = 0;
 my $port = $ns->RandomPort ();
 my $host = $ns->HostName ();
-my $nscorbaloc = "-ORBInitRef NameService=corbaloc:iiop:" .
-                 "$host:$port/NameService";
+my $nscorbaloc = "-ORBInitRef NameService=corbaloc:iiop:$host:$port/NameService";
 $static_build = new PerlACE::ConfigList->check_config('STATIC');
 
 my $testmonior = "test_monitor.ior";
@@ -48,8 +45,8 @@ my $notify_conf = "notify$PerlACE::svcconf_ext";
 
 my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 my $nfs_nfsiorfile = $nfs->LocalFile ($nfsiorfile);
-my $nfs_monitorior = $nfs->LocalFile ($monitorior);
 my $nfs_notify_conf = $nfs->LocalFile ($notify_conf);
+my $nfs_monitorior = $nfs->LocalFile ($monitorior);
 my $mon_monitorior = $mon->LocalFile ($monitorior);
 my $mon_testmonior = $mon->LocalFile ($testmonior);
 my $sup_testmonior = $sup->LocalFile ($testmonior);
@@ -57,12 +54,12 @@ my $con_testmonior = $con->LocalFile ($testmonior);
 my $con_readyfile = $con->LocalFile ($readyfile);
 $ns->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
-$nfs->DeleteFile ($monitorior);
 $nfs->DeleteFile ($notify_conf);
-$mon->DeleteFile ($monitor_ior);
-$mon->DeleteFile ($testmonitor);
-$sup->DeleteFile ($testmonitor);
-$con->DeleteFile ($testmonitor);
+$nfs->DeleteFile ($monitorior);
+$mon->DeleteFile ($monitorior);
+$mon->DeleteFile ($testmonior);
+$sup->DeleteFile ($testmonior);
+$con->DeleteFile ($testmonior);
 $con->DeleteFile ($readyfile);
 
 die "oops" if not open(FH, ">$notify_conf");
@@ -90,23 +87,20 @@ if ($nfs->PutFile ($notify_conf) == -1) {
 }
 
 my $NS = $ns->CreateProcess("../../../Naming_Service/Naming_Service",
-                              "-ORBEndpoint iiop://$host:$port " .
-                              "-o $nsiorfile");
+                            "-ORBEndpoint iiop://$host:$port -o $nsiorfile");
 my $NFS = $nfs->CreateProcess("../../../Notify_Service/Notify_Service",
                               "-ORBDebugLevel $debug_level ".
                               "$nscorbaloc " .
                               "-IORoutput $nfs_nfsiorfile " .
                               "-ORBSvcConf $nfs_notify_conf ");
 my $MON = $mon->CreateProcess("test_monitor",
-                               "-k file://$mon_monitorior ".
-                               "-o $mon_testmonior");
+                              "-k file://$mon_monitorior -o $mon_testmonior");
 my $SUP = $sup->CreateProcess("Structured_Supplier",
-                               "$nscorbaloc ".
-                               "-k file://$sup_testmonior");
+                              "$nscorbaloc ".
+                              "-k file://$sup_testmonior");
 my $CON = $con->CreateProcess("Structured_Consumer",
-                               "$nscorbaloc ".
-                               "-k file://$con_testmonior ".
-                               "-o $con_readyfile");
+                              "$nscorbaloc ".
+                              "-k file://$con_testmonior -o $con_readyfile");
 
 print $NS->CommandLine()."\n";
 $NS_status = $NS->Spawn ();
@@ -245,12 +239,12 @@ if ($NS_status != 0) {
 
 $ns->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
-$nfs->DeleteFile ($monitorior);
 $nfs->DeleteFile ($notify_conf);
-$mon->DeleteFile ($monitor_ior);
-$mon->DeleteFile ($testmonitor);
-$sup->DeleteFile ($testmonitor);
-$con->DeleteFile ($testmonitor);
+$nfs->DeleteFile ($monitorior);
+$mon->DeleteFile ($monitorior);
+$mon->DeleteFile ($testmonior);
+$sup->DeleteFile ($testmonior);
+$con->DeleteFile ($testmonior);
 $con->DeleteFile ($readyfile);
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
index af219403757..2e788fa9af9 100755
--- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
@@ -24,8 +24,6 @@ my $stc = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\
 my $ses = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n";
 my $sec = PerlACE::TestTarget::create_target (6) || die "Create target 6 failed\n";
 
-$ns->AddLibPath ('../lib');
-$ns->AddLibPath ('../lib');
 $sts->AddLibPath ('../lib');
 $stc->AddLibPath ('../lib');
 $ses->AddLibPath ('../lib');
@@ -37,28 +35,26 @@ $deadline = 0;
 $port = $ns->RandomPort ();
 $host = $ns->HostName ();
 
-$supiorfile = "supplier.ior";
+$iorbase = "supplier.ior";
 $nfsiorfile = "notify.ior";
 $nsiorfile = "naming.ior";
 $nfsconffile = "notify$PerlACE::svcconf_ext";
 
 my $ns_nsiorfile = $ns->LocalFile ($nsiorfile);
 my $nfs_nfsiorfile = $nfs->LocalFile ($nfsiorfile);
-my $sts_stsiorfile = $sts->LocalFile ($supiorfile);
-my $stc_stsiorfile = $stc->LocalFile ($supiorfile);
-my $sec_stsiorfile = $sec->LocalFile ($supiorfile);
-my $ses_sesiorfile = $ses->LocalFile ($supiorfile);
-my $sec_sesiorfile = $sec->LocalFile ($supiorfile);
-my $stc_sesiorfile = $stc->LocalFile ($supiorfile);
+my $sts_iorfile = $sts->LocalFile ($iorbase);
+my $stc_iorfile = $stc->LocalFile ($iorbase);
+my $sec_iorfile = $sec->LocalFile ($iorbase);
+my $ses_iorfile = $ses->LocalFile ($iorbase);
+my $sec_iorfile = $sec->LocalFile ($iorbase);
+my $stc_iorfile = $stc->LocalFile ($iorbase);
 my $nfs_nfsconffile = $nfs->LocalFile ($nfsconffile);
 $ns->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
-$sts->DeleteFile ($stsiorfile);
-$stc->DeleteFile ($stsiorfile);
-$sec->DeleteFile ($stsiorfile);
-$ses->DeleteFile ($sesiorfile);
-$sec->DeleteFile ($sesiorfile);
-$stc->DeleteFile ($sesiorfile);
+$sts->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
+$sec->DeleteFile ($iorbase);
+$ses->DeleteFile ($iorbase);
 
 foreach my $arg (@ARGV) {
     if ($arg eq "-d") {
@@ -72,8 +68,7 @@ foreach my $arg (@ARGV) {
 }
 
 $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service",
-                            "-ORBEndpoint iiop://$host:$port ".
-                            "-o $ns_nsiorfile");
+                          "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile");
 
 $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service",
                             "-ORBInitRef NameService=iioploc://" .
@@ -85,7 +80,7 @@ $STS = $sts->CreateProcess ("Structured_Supplier",
                             "-ORBDebugLevel $debug_level ".
                             "-ORBInitRef NameService=iioploc://".
                             "$host:$port/NameService ".
-                            "-o $sts_stsiorfile");
+                            "-o $sts_iorfile");
 
 $STC = $stc->CreateProcess ("Structured_Consumer");
 
@@ -93,12 +88,11 @@ $SES = $ses->CreateProcess ("Sequence_Supplier",
                             "-ORBDebugLevel $debug_level ".
                             "-ORBInitRef NameService=iioploc://".
                             "$host:$port/NameService ".
-                            "-o $ses_sesiorfile");
+                            "-o $ses_iorfile");
 
 $SEC = $sec->CreateProcess ("Sequence_Consumer");
 
-$CLI_args = "-ORBInitRef NameService=iioploc://".
-            "$host:$port/NameService ";
+$CLI_args = "-ORBInitRef NameService=iioploc://$host:$port/NameService ";
 
 $NS_status = $NS->Spawn ();
 if ($NS_status != 0) {
@@ -140,22 +134,22 @@ if ($STS_status != 0) {
     print STDERR "ERROR: Structured Supplier returned $STS_status\n";
     exit 1;
 }
-if ($sts->WaitForFileTimed ($stsiorfile,$sts->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$sts_stsiorfile>\n";
+if ($sts->WaitForFileTimed ($iorbase,$sts->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$sts_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($sts->GetFile ($stsiorfile) == -1) {
-    print STDERR "ERROR: cannot retrieve file <$sts_stsiorfile>\n";
+if ($sts->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$sts_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($stc->PutFile ($stsiorfile) == -1) {
-    print STDERR "ERROR: cannot set file <$stc_stsiorfile>\n";
+if ($stc->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$stc_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
@@ -163,7 +157,7 @@ if ($stc->PutFile ($stsiorfile) == -1) {
 }
 sleep 2;
 
-$STC->Arguments($CLI_args . " -k file://$stc_stsiorfile -d fifo");
+$STC->Arguments($CLI_args . " -k file://$stc_iorfile -d fifo");
 $STC_status = $STC->SpawnWaitKill ($stc->ProcessStartWaitInterval()+5);
 if ($STC_status != 0) {
     print STDERR "ERROR: Structured Consumer returned $STC_status\n";
@@ -181,8 +175,8 @@ if ($STS_status != 0) {
     exit 1;
 }
 
-$sts->DeleteFile ($stsiorfile);
-$stc->DeleteFile ($stsiorfile);
+$sts->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
 
 
 
@@ -193,22 +187,22 @@ if ($STS_status != 0) {
     print STDERR "ERROR: Structured Supplier returned $STS_status\n";
     exit 1;
 }
-if ($sts->WaitForFileTimed ($stsiorfile,$sts->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$sts_stsiorfile>\n";
+if ($sts->WaitForFileTimed ($iorbase,$sts->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$sts_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($sts->GetFile ($stsiorfile) == -1) {
-    print STDERR "ERROR: cannot retrieve file <$sts_stsiorfile>\n";
+if ($sts->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$sts_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($stc->PutFile ($stsiorfile) == -1) {
-    print STDERR "ERROR: cannot set file <$stc_stsiorfile>\n";
+if ($stc->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$stc_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
@@ -216,7 +210,7 @@ if ($stc->PutFile ($stsiorfile) == -1) {
 }
 sleep 2;
 
-$STC->Arguments($CLI_args . " -k file://$stc_stsiorfile -d priority -o");
+$STC->Arguments($CLI_args . " -k file://$stc_iorfile -d priority -o");
 $STC_status = $STC->SpawnWaitKill ($stc->ProcessStartWaitInterval()+5);
 if ($STC_status != 0) {
     print STDERR "ERROR: Structured Consumer returned $STC_status\n";
@@ -234,8 +228,8 @@ if ($STS_status != 0) {
     exit 1;
 }
 
-$sts->DeleteFile ($stsiorfile);
-$stc->DeleteFile ($stsiorfile);
+$sts->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
 
 
 
@@ -246,22 +240,22 @@ if ($STS_status != 0) {
     print STDERR "ERROR: Structured Supplier returned $STS_status\n";
     exit 1;
 }
-if ($sts->WaitForFileTimed ($stsiorfile,$sts->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$sts_stsiorfile>\n";
+if ($sts->WaitForFileTimed ($iorbase,$sts->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$sts_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($sts->GetFile ($stsiorfile) == -1) {
-    print STDERR "ERROR: cannot retrieve file <$sts_stsiorfile>\n";
+if ($sts->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$sts_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($sec->PutFile ($stsiorfile) == -1) {
-    print STDERR "ERROR: cannot set file <$sec_stsiorfile>\n";
+if ($sec->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$sec_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
@@ -269,7 +263,7 @@ if ($sec->PutFile ($stsiorfile) == -1) {
 }
 sleep 2;
 
-$SEC->Arguments($CLI_args . " -k file://$sec_stsiorfile -d priority -o");
+$SEC->Arguments($CLI_args . " -k file://$sec_iorfile -d priority -o");
 $SEC_status = $SEC->SpawnWaitKill ($sec->ProcessStartWaitInterval()+5);
 if ($SEC_status != 0) {
     print STDERR "ERROR: Sequence Consumer returned $SEC_status\n";
@@ -287,8 +281,8 @@ if ($STS_status != 0) {
     exit 1;
 }
 
-$sts->DeleteFile ($stsiorfile);
-$sec->DeleteFile ($stsiorfile);
+$sts->DeleteFile ($iorbase);
+$sec->DeleteFile ($iorbase);
 
 
 
@@ -299,22 +293,22 @@ if ($SES_status != 0) {
     print STDERR "ERROR: Sequence Supplier returned $SES_status\n";
     exit 1;
 }
-if ($ses->WaitForFileTimed ($sesiorfile,$ses->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$ses_sesiorfile>\n";
+if ($ses->WaitForFileTimed ($iorbase,$ses->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$ses_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($ses->GetFile ($sesiorfile) == -1) {
-    print STDERR "ERROR: cannot retrieve file <$ses_sesiorfile>\n";
+if ($ses->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$ses_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($stc->PutFile ($sesiorfile) == -1) {
-    print STDERR "ERROR: cannot set file <$stc_sesiorfile>\n";
+if ($stc->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$stc_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
@@ -322,7 +316,7 @@ if ($stc->PutFile ($sesiorfile) == -1) {
 }
 sleep 2;
 
-$STC->Arguments($CLI_args . " -k file://$stc_sesiorfile -d priority -o");
+$STC->Arguments($CLI_args . " -k file://$stc_iorfile -d priority -o");
 $STC_status = $STC->SpawnWaitKill ($stc->ProcessStartWaitInterval()+5);
 if ($STC_status != 0) {
     print STDERR "ERROR: Structured Consumer returned $STC_status\n";
@@ -340,8 +334,8 @@ if ($SES_status != 0) {
     exit 1;
 }
 
-$ses->DeleteFile ($sesiorfile);
-$stc->DeleteFile ($sesiorfile);
+$ses->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
 
 
 print "**** Sequence Supplier (fifo) -> Sequence Consumer (priority) *****\n";
@@ -351,22 +345,22 @@ if ($SES_status != 0) {
     print STDERR "ERROR: Sequence Supplier returned $SES_status\n";
     exit 1;
 }
-if ($ses->WaitForFileTimed ($sesiorfile,$ses->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$ses_sesiorfile>\n";
+if ($ses->WaitForFileTimed ($iorbase,$ses->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$ses_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($ses->GetFile ($sesiorfile) == -1) {
-    print STDERR "ERROR: cannot retrieve file <$ses_sesiorfile>\n";
+if ($ses->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$ses_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
     exit 1;
 }
-if ($sec->PutFile ($sesiorfile) == -1) {
-    print STDERR "ERROR: cannot set file <$sec_sesiorfile>\n";
+if ($sec->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$sec_iorfile>\n";
     $STS->Kill (); $STS->TimedWait (1);
     $NS->Kill (); $NS->TimedWait (1);
     $NFS->Kill (); $NFS->TimedWait (1);
@@ -374,7 +368,7 @@ if ($sec->PutFile ($sesiorfile) == -1) {
 }
 sleep 2;
 
-$SEC->Arguments($CLI_args . " -k file://$sec_sesiorfile -d priority -o");
+$SEC->Arguments($CLI_args . " -k file://$sec_iorfile -d priority -o");
 $SEC_status = $SEC->SpawnWaitKill ($sec->ProcessStartWaitInterval()+5);
 if ($SEC_status != 0) {
     print STDERR "ERROR: Sequence Consumer returned $SEC_status\n";
@@ -401,11 +395,9 @@ if ($NS_status != 0) {
 
 $ns->DeleteFile ($nsiorfile);
 $nfs->DeleteFile ($nfsiorfile);
-$sts->DeleteFile ($stsiorfile);
-$stc->DeleteFile ($stsiorfile);
-$sec->DeleteFile ($stsiorfile);
-$ses->DeleteFile ($sesiorfile);
-$sec->DeleteFile ($sesiorfile);
-$stc->DeleteFile ($sesiorfile);
+$sts->DeleteFile ($iorbase);
+$stc->DeleteFile ($iorbase);
+$sec->DeleteFile ($iorbase);
+$ses->DeleteFile ($iorbase);
 
 exit $status;
diff --git a/TAO/tests/AlternateIIOP/run_test.pl b/TAO/tests/AlternateIIOP/run_test.pl
index dcc476db1ee..3a0d0af6698 100755
--- a/TAO/tests/AlternateIIOP/run_test.pl
+++ b/TAO/tests/AlternateIIOP/run_test.pl
@@ -37,7 +37,7 @@ $client->DeleteFile($iorbase);
 $SV = $server->CreateProcess ("../Hello/server",
                               "-ORBdebuglevel $debug_level " .
                               "-o $server_iorfile " .
-                              "-ORBUseSharedProfile $use_shared_profile",
+                              "-ORBUseSharedProfile $use_shared_profile ",
                               "-OrbEndPoint iiop://$hostname:$port1/hostname_in_ior=bogus.com " .
                               "-OrbEndPoint iiop://$hostname:$port2 " .
                               "-OrbEndPoint iiop://$hostname:$port3/hostname_in_ior=bogus.com");