Mon May 19 15:12:21 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 24 insertions, 20 deletions

diff --git a/TAO/tests/Big_Reply/run_test.pl b/TAO/tests/Big_Reply/run_test.pl
index 44d65f0674f..08dda9e8104 100755
--- a/TAO/tests/Big_Reply/run_test.pl
+++ b/TAO/tests/Big_Reply/run_test.pl
@@ -8,18 +8,24 @@ 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;
 
 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");
 }
 $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
@@ -37,10 +43,10 @@ if ($client1 != 0) {
 }
 
 
-$server = $SV->WaitKill (10);
+$server_kill = $SV->WaitKill (10);
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
+if ($server_kill != 0) {
+    print STDERR "ERROR: server returned $server_kill\n";
     $status = 1;
 }
 
diff --git a/TAO/tests/Big_Request_Muxing/run_test.pl b/TAO/tests/Big_Request_Muxing/run_test.pl
index 67b31276979..d18138b67ad 100755
--- a/TAO/tests/Big_Request_Muxing/run_test.pl
+++ b/TAO/tests/Big_Request_Muxing/run_test.pl
@@ -8,10 +8,11 @@ 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");
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -e 400 -l 800");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase -e 400 -l 800");
 }
 else {
     $SV  = new PerlACE::Process ("server", "-o $iorfile -e 400 -l 800");
diff --git a/TAO/tests/Big_Twoways/run_test.pl b/TAO/tests/Big_Twoways/run_test.pl
index 8a2777afae6..b4fbaa3bdb8 100755
--- a/TAO/tests/Big_Twoways/run_test.pl
+++ b/TAO/tests/Big_Twoways/run_test.pl
@@ -30,20 +30,17 @@ $iorfile = PerlACE::LocalFile ($baseior);
 $status = 0;
 unlink $iorfile;
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o $baseior $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");
-    $CL4 = new PerlACE::Process ("client", " -k file://$iorfile -ORBDottedDecimalAddresses 1");
+    $SV = new PerlACE::ProcessVX ("server", "-o $baseior $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");
-    $CL4 = 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");
+$CL4 = new PerlACE::Process ("client", " -k file://$iorfile");
+
 ############## Spawn Server ###########
 
 $server = $SV->Spawn ();
diff --git a/TAO/tests/Bug_1476_Test/client.cpp b/TAO/tests/Bug_1476_Test/client.cpp
index 4dab919d4fe..47680ef8bc3 100644
--- a/TAO/tests/Bug_1476_Test/client.cpp
+++ b/TAO/tests/Bug_1476_Test/client.cpp
@@ -201,9 +201,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
-      ACE_ERROR ((LM_ERROR, "Exception caught: %s\"%s\"\n"
+      ACE_ERROR ((LM_ERROR, "ERROR: Exception caught: %s\"%s\"\n"
       , ex._name(), ex._rep_id ()));
       return 1;
     }
diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
index b311fe68f15..6e8a24bfd5d 100644
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ b/TAO/tests/Bug_2494_Regression/client.cpp
@@ -130,7 +130,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (CORBA::Exception& ex)
     {
-      ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) Exception caught: \n%s\n"),
+      ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Exception caught: \n%s\n"),
                   ACE_TEXT_CHAR_TO_TCHAR (ex._info ().c_str ())));
       return 1;
     }