Fri Nov 28 12:39:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 44 insertions, 4 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 517c4919336..786f6bb184b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Nov 28 12:39:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation_Tests/run_test.pl:
+        * tests/Native_Exceptions/run_test.pl:
+        * tests/Servant_To_Reference_Test/run_test.pl:
+        * tests/Server_Port_Zero/run_test.pl:
+        * tests/AMH_Exceptions/run_test.pl:
+          Fixed fuzz errors/warnings
+
 Fri Nov 28 11:27:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Abstract_Interface/run_test.pl
diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl
index f4d824f89a5..9dac20d45b3 100755
--- a/TAO/tests/AMH_Exceptions/run_test.pl
+++ b/TAO/tests/AMH_Exceptions/run_test.pl
@@ -8,9 +8,16 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that tests AMH exceptions
 
 use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
 use PerlACE::TestTarget;
 
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
 my $target = PerlACE::TestTarget::create_target(1) || die "Create target 1 failed\n";
 my $host = PerlACE::TestTarget::create_target(2) || die "Create targer 2 failed\n";
 
diff --git a/TAO/tests/Collocation_Tests/run_test.pl b/TAO/tests/Collocation_Tests/run_test.pl
index 20fbab43df4..96ad2e227b8 100755
--- a/TAO/tests/Collocation_Tests/run_test.pl
+++ b/TAO/tests/Collocation_Tests/run_test.pl
@@ -66,7 +66,7 @@ if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
     $status = 1;
 }
-unlink $iorfile;
+$server->DeleteFile($iorbase);
 
 print STDERR "======== Running in no collocation mode and two ORBS \n";
 $SV->Arguments ("-o $server_iorfile -k file://$server_iorfile -n -ORBCollocation no");
diff --git a/TAO/tests/Native_Exceptions/run_test.pl b/TAO/tests/Native_Exceptions/run_test.pl
index c7112162654..794010a5ef3 100755
--- a/TAO/tests/Native_Exceptions/run_test.pl
+++ b/TAO/tests/Native_Exceptions/run_test.pl
@@ -11,6 +11,14 @@ use PerlACE::TestTarget;
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
 my $iorbase = "server.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 my $client_iorfile = $client->LocalFile ($iorbase);
diff --git a/TAO/tests/Servant_To_Reference_Test/run_test.pl b/TAO/tests/Servant_To_Reference_Test/run_test.pl
index 12357e5f415..094a06cae8f 100755
--- a/TAO/tests/Servant_To_Reference_Test/run_test.pl
+++ b/TAO/tests/Servant_To_Reference_Test/run_test.pl
@@ -6,13 +6,21 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
+use PerlACE::TestTarget;
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $iorbase = "server.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $status = 0;
 
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
 $server_status = $SV->Spawn ();
 
diff --git a/TAO/tests/Server_Port_Zero/run_test.pl b/TAO/tests/Server_Port_Zero/run_test.pl
index 12302c3b8b5..208fd2f0f69 100755
--- a/TAO/tests/Server_Port_Zero/run_test.pl
+++ b/TAO/tests/Server_Port_Zero/run_test.pl
@@ -8,6 +8,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
 
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $iorbase = "server.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
@@ -37,6 +45,6 @@ if ($server != 0) {
     $status = 1;
 }
 
-unlink $iorfile;
+$server->DeleteFile($iorbase);
 
 exit $status;