Thu Dec 6 15:10:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 29 insertions, 32 deletions

diff --git a/TAO/tests/BiDirectional/run_test.pl b/TAO/tests/BiDirectional/run_test.pl
index 60ee4d12551..a424f9052a4 100755
--- a/TAO/tests/BiDirectional/run_test.pl
+++ b/TAO/tests/BiDirectional/run_test.pl
@@ -20,7 +20,7 @@ if (PerlACE::is_vxworks_test()) {
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile -i 100");
 }
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1");
+$CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
 # print $SV->CommandLine ()."\n";
 $SV->Spawn ();
diff --git a/TAO/tests/Big_Oneways/run_test.pl b/TAO/tests/Big_Oneways/run_test.pl
index 9e4f729e416..8393570a65c 100755
--- a/TAO/tests/Big_Oneways/run_test.pl
+++ b/TAO/tests/Big_Oneways/run_test.pl
@@ -23,24 +23,22 @@ if (defined $opt_i) {
 if (defined $opt_b) {
     $server_args .= " -b ".$opt_b;
 }
-
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfilebase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 
 $status = 0;
 unlink $iorfile;
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior $server_args -ORBDottedDecimalAddresses 1");
-    $CL1 = new PerlACE::Process ("client", " -k file://$iorfile -ORBDottedDecimalAddresses 1");
-    $CL2 = new PerlACE::Process ("client", " -k file://$iorfile -ORBDottedDecimalAddresses 1");
-    $CL3 = new PerlACE::Process ("client", " -k file://$iorfile -ORBDottedDecimalAddresses 1");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase $server_args");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile $server_args");
-    $CL1 = new PerlACE::Process ("client", " -k file://$iorfile");
-    $CL2 = new PerlACE::Process ("client", " -k file://$iorfile");
-    $CL3 = new PerlACE::Process ("client", " -k file://$iorfile");
 }
 
+$CL1 = new PerlACE::Process ("client", " -k file://$iorfile");
+$CL2 = new PerlACE::Process ("client", " -k file://$iorfile");
+$CL3 = new PerlACE::Process ("client", " -k file://$iorfile");
+
 $server = $SV->Spawn ();
 
 if ($server != 0) {
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index 8e1f4af358e..1cff6fff879 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -60,9 +60,10 @@ Client_Task::validate_connection (void)
     {
       try
         {
-
           this->reply_gen_->ping ();
         }
-      catch (const CORBA::Exception&){}
+      catch (const CORBA::Exception&)
+        {
+        }
     }
 }
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index a22e1ef6d44..1e4e18027b5 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -66,7 +66,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      Big_Reply_i *big_reply_gen;
+      Big_Reply_i *big_reply_gen = 0;
 
       ACE_NEW_RETURN (big_reply_gen,
                       Big_Reply_i (orb.in (),
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index dcdbe2d82f1..39c38c7cd93 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -76,7 +76,6 @@ Client_Task::svc (void)
       CORBA::Any scope_as_any;
       scope_as_any <<= this->sync_scope_;
 
-
       CORBA::PolicyList policy_list (1);
       policy_list.length (1);
       policy_list[0] =
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 58a57f25f74..bc505fd004a 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -131,7 +131,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Building session list . . . "));
 
-      Session_Control *session_control_impl;
+      Session_Control *session_control_impl = 0;
       ACE_NEW_RETURN (session_control_impl,
                       Session_Control (peer_count),
                       1);
@@ -170,7 +170,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             }
 
           session_list[j]->start (other_sessions);
-
         }
 
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
diff --git a/TAO/tests/DIOP/run_test.pl b/TAO/tests/DIOP/run_test.pl
index 689374ea71b..5fda0599af6 100755
--- a/TAO/tests/DIOP/run_test.pl
+++ b/TAO/tests/DIOP/run_test.pl
@@ -1,4 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+pereval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
@@ -22,14 +22,14 @@ $iorfile = PerlACE::LocalFile ($iorbase);
 
 if (PerlACE::is_vxworks_test()) {
   $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
-  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:8888 -o $iorbase -ORBdebuglevel $ORBdebuglevel -ORBDottedDecimalAddresses 1");
-  $CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel -ORBDottedDecimalAddresses 1");
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:8888 -o $iorbase -ORBdebuglevel $ORBdebuglevel");
 }
 else {
   $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:8888 -o $iorfile -ORBdebuglevel $ORBdebuglevel");
-  $CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel");
 }
 
+$CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel");
+
 $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/tests/DIOP/run_test_ipv6.pl b/TAO/tests/DIOP/run_test_ipv6.pl
index 2670b87d101..e28cb715d07 100755
--- a/TAO/tests/DIOP/run_test_ipv6.pl
+++ b/TAO/tests/DIOP/run_test_ipv6.pl
@@ -22,14 +22,14 @@ $iorfile = PerlACE::LocalFile ($iorbase);
 
 if (PerlACE::is_vxworks_test()) {
   $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
-  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:8888 -o $iorbase -ORBdebuglevel $ORBdebuglevel -ORBDottedDecimalAddresses 1");
-  $CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel -ORBDottedDecimalAddresses 1");
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:8888 -o $iorbase -ORBdebuglevel $ORBdebuglevel");
 }
 else {
   $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:8888 -o $iorfile -ORBdebuglevel $ORBdebuglevel");
-  $CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel");
 }
 
+$CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel");
+
 $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/tests/MT_BiDir/run_test.pl b/TAO/tests/MT_BiDir/run_test.pl
index 02ea1a066e9..49e512ef9b6 100755
--- a/TAO/tests/MT_BiDir/run_test.pl
+++ b/TAO/tests/MT_BiDir/run_test.pl
@@ -20,9 +20,9 @@ if (PerlACE::is_vxworks_test()) {
 else {
     $SV = new PerlACE::Process ("server", "-ORBSvcConf server$PerlACE::svcconf_ext -o $iorfile -c 3 -i 100");
 }
-$CL1 = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1");
-$CL2 = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1");
-$CL3 = new PerlACE::Process ("client", "-k file://$iorfile -ORBDottedDecimalAddresses 1");
+$CL1 = new PerlACE::Process ("client", "-k file://$iorfile");
+$CL2 = new PerlACE::Process ("client", "-k file://$iorfile");
+$CL3 = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
diff --git a/TAO/tests/Nested_Event_Loop/run_test.pl b/TAO/tests/Nested_Event_Loop/run_test.pl
index f78b58c7d70..6b6efad7e29 100755
--- a/TAO/tests/Nested_Event_Loop/run_test.pl
+++ b/TAO/tests/Nested_Event_Loop/run_test.pl
@@ -15,14 +15,14 @@ $iorfile = PerlACE::LocalFile ($baseior);
 unlink $iorfile;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o $baseior -ORBDottedDecimalAddresses 1");
-    $CL = new PerlACE::Process ("client", "-k file://$iorfile -x -ORBDottedDecimalAddresses 1");
+    $SV = new PerlACE::ProcessVX ("server", "-o $baseior");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile");
-    $CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
 }
 
+$CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
+
 $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index 0327652d82d..31824d238ea 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -10,7 +10,7 @@ project(*idl): taoidldefaults {
 
 project(*Server): taoserver, messaging {
   after += *idl
-  specific(bmake, borland, nmake, em3, vc6, vc71, vc8) {
+  specific(bmake, borland, nmake, em3, vc6, vc71, vc8, vc9) {
     // Use a roughly 16MB stack to avoid stack overflow in this test
     StackReserveSize = 16000000
   }
diff --git a/TAO/tests/Smart_Proxies/Policy/run_test.pl b/TAO/tests/Smart_Proxies/Policy/run_test.pl
index 082291c76cc..19d44e96cee 100755
--- a/TAO/tests/Smart_Proxies/Policy/run_test.pl
+++ b/TAO/tests/Smart_Proxies/Policy/run_test.pl
@@ -101,7 +101,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV1->WaitKill (10);
+$server = $SV1->WaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: server 1 returned $server\n";
@@ -110,7 +110,7 @@ if ($server != 0) {
 
 unlink $iorfile1;
 
-$server = $SV2->WaitKill (10);
+$server = $SV2->WaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: server 2 returned $server\n";