Mon Feb 25 19:47:37 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 23 insertions, 27 deletions

diff --git a/TAO/tests/Bug_2183_Regression/run_test.pl b/TAO/tests/Bug_2183_Regression/run_test.pl
index 0b695f5d9c0..293e8b1dd07 100755
--- a/TAO/tests/Bug_2183_Regression/run_test.pl
+++ b/TAO/tests/Bug_2183_Regression/run_test.pl
@@ -26,6 +26,7 @@ $DUMMY_CLIENT = new PerlACE::Process($perl_executable);
 $CLIENT     = new PerlACE::Process(PerlACE::LocalFile("client"));
 
 $DUMMY_CLIENT->Arguments("hang_client.pl");
+$DUMMY_CLIENT->IgnoreHostRoot(1);
 $DUMMY_CLIENT->IgnoreExeSubDir(1);
 
 if (PerlACE::is_vxworks_test()) {
diff --git a/TAO/tests/Bug_2702_Regression/run_test.pl b/TAO/tests/Bug_2702_Regression/run_test.pl
index 9d1a90172fe..27637692b49 100755
--- a/TAO/tests/Bug_2702_Regression/run_test.pl
+++ b/TAO/tests/Bug_2702_Regression/run_test.pl
@@ -28,6 +28,7 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBdebuglevel 1 -ORB
 unlink "client.log";
 
 $SV->IgnoreExeSubDir(1);
+$SV->IgnoreHostRoot(1);
 $SV->Spawn ();
 sleep(1);  # give the server a chance to come up
 
diff --git a/TAO/tests/Bug_3154_Regression/run_test.pl b/TAO/tests/Bug_3154_Regression/run_test.pl
index fcb2c8c5bf2..f6e64e0c3c4 100755
--- a/TAO/tests/Bug_3154_Regression/run_test.pl
+++ b/TAO/tests/Bug_3154_Regression/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $tao_idl = "$PerlACE::ACE_ROOT/bin/tao_idl";
 if (exists $ENV{HOST_ROOT}) {
-    $tao_idl = "$ENV{HOST_ROOT}/bin/tao_idl";
+    $tao_idl = "/bin/tao_idl";
 }
 
 # IDL file names
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index 35af692cbea..c292dc56c93 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -127,7 +127,7 @@ namespace Test
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Calling shutdown \n"));
 
-          // Just wait for the main thread to start sening out
+          // Just wait for the main thread to start sending out
           // messages
           ACE_OS::sleep (4);
 
@@ -177,9 +177,7 @@ namespace Test
     try
       {
         CORBA::ORB_var orb =
-          CORBA::ORB_init (argc,
-                           argv,
-                           "");
+          CORBA::ORB_init (argc, argv);
 
         if (parse_args (argc, argv) == false)
           return -1;
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index 8a9a97193bc..ca642c6c08e 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -16,9 +16,7 @@ namespace Test
     try
       {
         CORBA::ORB_var orb =
-          CORBA::ORB_init (argc,
-                           argv,
-                           "");
+          CORBA::ORB_init (argc, argv);
 
         CORBA::Object_var poa_object =
           orb->resolve_initial_references("RootPOA");
@@ -34,7 +32,7 @@ namespace Test
         PortableServer::POAManager_var poa_manager =
           root_poa->the_POAManager ();
 
-        test_i *test_impl;
+        test_i *test_impl = 0;
         ACE_NEW_RETURN (test_impl,
                         test_i (),
                         1);
@@ -70,8 +68,7 @@ namespace Test
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) server - event loop finished\n"));
 
-        root_poa->destroy (1,
-                           1);
+        root_poa->destroy (1, 1);
 
         orb->destroy ();
       }
diff --git a/TAO/tests/Leader_Followers/run_test.pl b/TAO/tests/Leader_Followers/run_test.pl
index 063b03d5af9..e5cccb7ed0d 100755
--- a/TAO/tests/Leader_Followers/run_test.pl
+++ b/TAO/tests/Leader_Followers/run_test.pl
@@ -9,14 +9,15 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("lf.ior");
+$iorfilebase = "lf.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 $tp_conf_base = "tp$PerlACE::svcconf_ext";
 $select_mt_conf_base = "select_mt$PerlACE::svcconf_ext";
 $tp_conf = PerlACE::LocalFile ("$tp_conf_base");
 $select_mt_conf = PerlACE::LocalFile ("$select_mt_conf_base");
 
 if (PerlACE::is_vxworks_test()) {
-    $sv_iorfile = "lf.ior";
+    $sv_iorfile = $iorfilebase;
     $SV = new PerlACE::ProcessVX ("server");
     $tpool_reactor_directive = "-ORBsvcconf $tp_conf_base";
     $select_reactor_directive = "-ORBsvcconf $select_mt_conf_base";
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index a101bda2b09..1eb69c46c97 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -78,8 +78,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA::Object_ptr IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0);
+        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
       TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
         TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
@@ -97,7 +96,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in ());
 
-
       CORBA::Any timeout_as_any;
       timeout_as_any <<= timeout_period;
 
@@ -108,7 +106,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         orb->create_policy (TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
                             timeout_as_any);
 
-
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::ADD_OVERRIDE);
 
@@ -139,7 +136,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) ERROR in the test \n")));
 
-
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) Shutting server down \n")));
 
diff --git a/TAO/tests/MProfile_Connection_Timeout/run_test.pl b/TAO/tests/MProfile_Connection_Timeout/run_test.pl
index 9c8a64558ba..e554d2670a7 100755
--- a/TAO/tests/MProfile_Connection_Timeout/run_test.pl
+++ b/TAO/tests/MProfile_Connection_Timeout/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile1 = PerlACE::LocalFile ("server1.ior");
+$iorfile1base = "server1.ior";
+$iorfile1 = PerlACE::LocalFile ("$iorfile1base");
 $iorfile2 = PerlACE::LocalFile ("server2.ior");
 
 unlink $iorfile1;
@@ -17,7 +18,7 @@ unlink $iorfile2;
 $status = 0;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV1 = new PerlACE::ProcessVX ("server", "-o server1.ior");
+    $SV1 = new PerlACE::ProcessVX ("server", "-o $iorfile1base");
 }
 else {
     $SV1 = new PerlACE::Process ("server", "-o $iorfile1");
@@ -32,7 +33,7 @@ if (PerlACE::waitforfile_timed ($iorfile1,
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
     $SV1->Kill (); $SV1->TimedWait (1);
     exit 1;
-} 
+}
 
 $SV2->Spawn ();
 if (PerlACE::waitforfile_timed ($iorfile2,
@@ -40,7 +41,7 @@ if (PerlACE::waitforfile_timed ($iorfile2,
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (300);
 
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 436ff82a7e8..a90d57ecc50 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -79,9 +79,9 @@ Client_Task::svc (void)
           int retval = this->one_iteration ();
 
           if (retval == 1)
-            successful_calls++;
+            ++successful_calls;
           else if (retval == 0)
-            timed_out_calls++;
+            ++timed_out_calls;
 
 #if 0
           if (i % 50 == 0)
diff --git a/TAO/tests/MT_Timeout/run_test.pl b/TAO/tests/MT_Timeout/run_test.pl
index 9bde7ae111e..cdadb01e543 100755
--- a/TAO/tests/MT_Timeout/run_test.pl
+++ b/TAO/tests/MT_Timeout/run_test.pl
@@ -8,12 +8,13 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfilebase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 $status = 0;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile");
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index 19d94f713d0..39cd395e926 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -48,7 +48,7 @@ Database_i::get (Test::Index i)
   if (i >= this->max_range_)
     throw Test::OutOfRange (0, this->max_range_);
 
-  Test::OctetSeq* copy;
+  Test::OctetSeq* copy = 0;
   ACE_NEW_THROW_EX (copy,
                     Test::OctetSeq (this->elements_[i]),
                     CORBA::NO_MEMORY ());