Thu May 24 12:02:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 31 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9412532de9d..8d6167d484c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 24 12:02:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Muxed_GIOP_Versions/run_test.pl:
+        * tests/POA/Bug_1592_Regression/run_test.pl:
+          Updated for cross platform testing
+
 Thu May 24 08:00:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Connection_Purging/run_test.pl:
diff --git a/TAO/tests/Muxed_GIOP_Versions/run_test.pl b/TAO/tests/Muxed_GIOP_Versions/run_test.pl
index ef81dc186c7..22100f59693 100755
--- a/TAO/tests/Muxed_GIOP_Versions/run_test.pl
+++ b/TAO/tests/Muxed_GIOP_Versions/run_test.pl
@@ -9,9 +9,15 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbasefile = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbasefile");
 
-$TARGETHOSTNAME = "localhost";
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
+}
+else {
+  $TARGETHOSTNAME = "localhost";
+}
 $orb_port=12000 + PerlACE::uniqueid ();
 $logfile = PerlACE::LocalFile("orb.$orb_port.log");
 unlink $iorfile;
@@ -34,15 +40,19 @@ $corbaloc_str = "corbaloc:iiop:1.0\@$TARGETHOSTNAME:$orb_port/SomeObjectNameThat
 
 # ORBDebugLevel 10 seems to encourage the problem
 # -ORBCollocation no  is required for server to produce the problem
+
+if (PerlACE::is_vxworks_test()) {
 $serverargs = "-ORBCollocation no -ORBdebuglevel 10 -ORBLogFile $logfile " .
-              "-ORBEndpoint iiop://$TARGETHOSTNAME:$orb_port -o $iorfile " .
+              "-ORBEndpoint iiop://$TARGETHOSTNAME:$orb_port -o $iorbasefile " .
               "-i $serveriterations -n $serverthreads -c $selfabusethreads " .
               "-l $corbaloc_str";
-
-if (PerlACE::is_vxworks_test()) {
   $SV = new PerlACE::ProcessVX ("server", $serverargs);
 }
 else {
+$serverargs = "-ORBCollocation no -ORBdebuglevel 10 -ORBLogFile $logfile " .
+              "-ORBEndpoint iiop://$TARGETHOSTNAME:$orb_port -o $iorfile " .
+              "-i $serveriterations -n $serverthreads -c $selfabusethreads " .
+              "-l $corbaloc_str";
   $SV = new PerlACE::Process ("server", $serverargs);
 }
 
@@ -90,7 +100,7 @@ if ($clients > 0) {
 }
 
 if ($clients > 1) {
-  $client = $CL2->WaitKill (5);
+  $client = $CL2->WaitKill (15);
 
   if ($client != 0) {
     print STDERR "ERROR: client 2 returned $client\n";
@@ -99,7 +109,7 @@ if ($clients > 1) {
 }
 
 if ($clients > 2) {
-  $client = $CL3->WaitKill (5);
+  $client = $CL3->WaitKill (15);
 
   if ($client != 0) {
     print STDERR "ERROR: client 3 returned $client\n";
diff --git a/TAO/tests/POA/Bug_1592_Regression/run_test.pl b/TAO/tests/POA/Bug_1592_Regression/run_test.pl
index e52ba7d5243..93c4abf276f 100755
--- a/TAO/tests/POA/Bug_1592_Regression/run_test.pl
+++ b/TAO/tests/POA/Bug_1592_Regression/run_test.pl
@@ -10,11 +10,17 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$file = PerlACE::LocalFile ("test.ior");
+$filebase = "test.ior";
+$file = PerlACE::LocalFile ("$filebase");
 
 unlink $file;
 
+if (PerlACE::is_vxworks_test()) {
+$SV = new PerlACE::ProcessVX ("server", "-o $filebase");
+}
+else {
 $SV = new PerlACE::Process ("server", "-o $file");
+}
 $CL = new PerlACE::Process ("client", "-k file://$file");
 
 $status = 0;
@@ -36,7 +42,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";