Mon May 28 05:06:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 25 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 51f84ce7b33..7c4e67fa7de 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon May 28 05:06:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/RTCORBA/Explicit_Binding/run_test.pl:
+        * tests/RTCORBA/Server_Protocol/run_test.pl:
+        * tests/Two_Objects/run_test.pl:
+          Updated for cross host testing
+
 Mon May 28 01:01:09 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp:
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
index 0c58e6b807a..77203ccc787 100755
--- a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
+++ b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
@@ -9,14 +9,20 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
 print STDERR "\n********** RTCORBA Explicit Binding Unit Test\n\n";
 
 
+if (PerlACE::is_vxworks_test()) {
+$SV = new PerlACE::ProcessVX ("server", "-o $iorbase -ORBendpoint iiop:// -ORBendpoint shmiop://");
+}
+else {
 $SV = new PerlACE::Process ("server", "-o $iorfile -ORBendpoint iiop:// -ORBendpoint shmiop://");
+}
 $CL = new PerlACE::Process ("client", "-o file://$iorfile -ORBdebuglevel 1");
 
 $SV->Spawn ();
diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
index 85128868f6f..d7679672dab 100755
--- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
@@ -63,10 +63,14 @@ print STDERR "********** RTCORBA Server Protocol Policy Unit Test\n";
 
 $test_number = 0;
 
-$SV = new PerlACE::Process ("server");
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server");
+}
+else {
+    $SV = new PerlACE::Process ("server");
+}
 $CL = new PerlACE::Process ("client");
 
-
 foreach $o (@server_opts) {
     print STDERR "\n\n----------------------------------\n";
     print STDERR "        ".$comments[$test_number];
diff --git a/TAO/tests/Two_Objects/run_test.pl b/TAO/tests/Two_Objects/run_test.pl
index ffc5376132f..2dcc3917a2a 100755
--- a/TAO/tests/Two_Objects/run_test.pl
+++ b/TAO/tests/Two_Objects/run_test.pl
@@ -8,15 +8,16 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
+$baseiorfile = "test.ior";
+$iorfile = PerlACE::LocalFile ("$baseiorfile");
 unlink $iorfile;
 $status = 0;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o test.ior -t 10 -l 100000");
+    $SV = new PerlACE::ProcessVX ("server", "-o $baseiorfile -t 10 -l 100000");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile -t 10 0l 100000");    
+    $SV = new PerlACE::Process ("server", "-o $iorfile -t 10 0l 100000");
 }
 $CL = new PerlACE::Process ("client", " -r file://$iorfile");
 
@@ -27,7 +28,7 @@ if (PerlACE::waitforfile_timed ($iorfile,
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (60);