ChangeLogTag: Mon Jul 23 20:58:16 UTC 2012 Adam Mitz <mitza@ociweb.com>

3 files changed, 27 insertions, 17 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 92ed82449d8..a7b63000c27 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jul 23 20:58:16 UTC 2012  Adam Mitz  <mitza@ociweb.com>
+
+        * tests/Bug_3630_Regression/run_test.pl:
+        * tests/Smart_Proxies/Policy/run_test.pl:
+
+          Fixed long-standing bugs in perl scripts that were only
+          noticed with the TestTarget.pm fix in ACE Fri Jul 20 17:37:27 UTC 2012
+
 Fri Jul 20 17:38:45 UTC 2012  Adam Mitz  <mitza@ociweb.com>
 
         * tao/CDR.inl:
diff --git a/TAO/tests/Bug_3630_Regression/run_test.pl b/TAO/tests/Bug_3630_Regression/run_test.pl
index 2b5d3559de4..488f36bcc66 100755
--- a/TAO/tests/Bug_3630_Regression/run_test.pl
+++ b/TAO/tests/Bug_3630_Regression/run_test.pl
@@ -7,21 +7,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
+use strict;
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
 my $srvconf = "TAO Conf File.conf";
-my $server_svcconf = $server->LocalFile ($svcconf);
+my $server_svcconf = $server->LocalFile ($srvconf);
 
-if ($server->PutFile ($svcconf) == -1) {
+if ($server->PutFile ($srvconf) == -1) {
     print STDERR "ERROR: cannot set file <$server_svcconf>\n";
     exit 1;
 }
 
 
-$SV = $server->CreateProcess ("server");
+my $SV = $server->CreateProcess ("server");
 
-$server_status = $SV->Spawn ();
+my $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";
@@ -29,7 +30,7 @@ if ($server_status != 0) {
 }
 
 $server_status = $SV->WaitKill ($server->ProcessStartWaitInterval());
-
+my $status = 0;
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";
     $status = 1;
diff --git a/TAO/tests/Smart_Proxies/Policy/run_test.pl b/TAO/tests/Smart_Proxies/Policy/run_test.pl
index 916f26c202c..3aae3f2ac39 100755
--- a/TAO/tests/Smart_Proxies/Policy/run_test.pl
+++ b/TAO/tests/Smart_Proxies/Policy/run_test.pl
@@ -7,11 +7,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
+use strict;
 
-$status = 0;
-$debug_level = '0';
+my $status = 0;
+my $debug_level = '0';
 
-foreach $i (@ARGV) {
+foreach my $i (@ARGV) {
     if ($i eq '-debug') {
         $debug_level = '10';
     }
@@ -32,16 +33,16 @@ $server2->DeleteFile($iorbase2);
 $client->DeleteFile($iorbase1);
 $client->DeleteFile($iorbase2);
 
-$SV1 = $server1->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server1_iorfile");
-$SV2 = $server2->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server2_iorfile");
-$CL = $client->CreateProcess ("client",
-                              "-i file://$client_iorfile1 ".
-                              "-j file://$client_iorfile2");
+my $SV1 = $server1->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server1_iorfile");
+my $SV2 = $server2->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server2_iorfile");
+my $CL = $client->CreateProcess ("client",
+                                 "-i file://$client_iorfile1 ".
+                                 "-j file://$client_iorfile2");
 
 print STDERR "\nrunning Smart Proxy test consisting of the client and ".
     "two servers with <one-shot> policy\n\n";
 
-$server_status = $SV1->Spawn ();
+my $server_status = $SV1->Spawn ();
 
 if ($server_status != 0) {
     print STDERR "ERROR: server returned $server_status\n";
@@ -89,14 +90,14 @@ if ($server2->GetFile ($iorbase2) == -1) {
     $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
 }
-if ($client->PutFile ($iorbase) == -1) {
+if ($client->PutFile ($iorbase2) == -1) {
     print STDERR "ERROR: cannot set file <$client_iorfile2>\n";
     $SV1->Kill (); $SV1->TimedWait (1);
     $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
+my $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
@@ -173,7 +174,7 @@ if ($server2->GetFile ($iorbase2) == -1) {
     $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
 }
-if ($client->PutFile ($iorbase) == -1) {
+if ($client->PutFile ($iorbase2) == -1) {
     print STDERR "ERROR: cannot set file <$client_iorfile2>\n";
     $SV1->Kill (); $SV1->TimedWait (1);
     $SV2->Kill (); $SV2->TimedWait (1);