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

2 files changed, 6 insertions, 9 deletions

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);