Tue May 29 09:25:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 38 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 64196cbef6f..8c8b54263d9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 29 09:25:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/RTCORBA/Banded_Connections/run_test.pl:
+        * tests/RTCORBA/Client_Propagated/run_test.pl:
+        * tests/RTCORBA/Client_Protocol/run_test.pl:
+          Updated for vxworks rtp, the RTCorba tests do require that the
+          client also can use priorities, so when we have vxworks rtp,
+          run also the client on the target
+
 Tue May 29 00:15:35 UTC 2007  Scott Harris  <harris_s@ociweb.com>
 
         * TAO_IDL/be/be_visitor_native/native_ch.cpp:
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index 194a9d6d588..1a7accccdbe 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -10,8 +10,10 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$iorfile1 = PerlACE::LocalFile ("test1.ior");
-$iorfile2 = PerlACE::LocalFile ("test2.ior");
+$iorfile1base = "test1.ior";
+$iorfile2base = "test2.ior";
+$iorfile1 = PerlACE::LocalFile ("$iorfile1base");
+$iorfile2 = PerlACE::LocalFile ("$iorfile2base");
 
 unlink $iorfile1;
 unlink $iorfile2;
@@ -47,26 +49,31 @@ if (PerlACE::is_vxworks_test()) {
 else {
     $SV = new PerlACE::Process ("server", $server_args);
 }
-$CL = new PerlACE::Process ("client", "-n file://$iorfile1 -o file://$iorfile2");
+if (PerlACE::is_vxworks_rtp_test()) {
+    $CL = new PerlACE::ProcessVX ("client", "-n file://$iorfile1base -o file://$iorfile2base");
+}
+else {
+    $CL = new PerlACE::Process ("client", "-n file://$iorfile1 -o file://$iorfile2");
+}
 
 $SV->Spawn();
-if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1) 
+if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1)
 {
     $server = $SV->TimedWait (1);
-    if ($server == 2) 
+    if ($server == 2)
     {
         # Mark as no longer running to avoid errors on exit.
         $SV->{RUNNING} = 0;
         exit $status;
     }
-    else 
+    else
     {
         print STDERR "ERROR: cannot find file <$iorfile2>\n";
         $SV->Kill ();
         exit 1;
     }
 }
- 
+
 $client = $CL->SpawnWaitKill (60);
 
 if ($client != 0) {
@@ -76,7 +83,7 @@ if ($client != 0) {
 
 $server = $SV->WaitKill (30);
 
-if ($server != 0) 
+if ($server != 0)
 {
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
index 921020eea73..a5b2484f4fd 100755
--- a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
@@ -9,20 +9,25 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorfilebase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 
 unlink $iorfile;
 
 print STDERR "\n            RTCORBA CLIENT_PROPAGATED Priority Unit Test\n\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", , "-o test.ior");
+    $SV = new PerlACE::ProcessVX ("server", , "-o $iorfilebase");
 }
 else {
     $SV = new PerlACE::Process ("server", , "-o $iorfile");
 }
-$CL = new PerlACE::Process ("client", "-k file://$iorfile");
+if (PerlACE::is_vxworks_rtp_test()) {
+    $CL = new PerlACE::ProcessVX ("client", "-k file://$iorfilebase");
+}
+else {
+    $CL = new PerlACE::Process ("client", "-k file://$iorfile");
+}
 
 $SV->Spawn ();
 
diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
index 00738e14815..3fd19cdf619 100755
--- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
@@ -9,9 +9,10 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-
-$iorfile1 = PerlACE::LocalFile ("test1.ior");
-$iorfile2 = PerlACE::LocalFile ("test2.ior");
+$iorfile1base = "test1.ior";
+$iorfile2base = "test2.ior";
+$iorfile1 = PerlACE::LocalFile ("$iorfile1base");
+$iorfile2 = PerlACE::LocalFile ("$iorfile2base");
 
 unlink $iorfile1;
 unlink $iorfile2;
@@ -39,7 +40,7 @@ $client_args =
 
 # Start server.
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-s test1.ior -c test2.ior $server_args");
+    $SV = new PerlACE::ProcessVX ("server", "-s $iorfile1base -c $iorfile2base $server_args");
 }
 else {
     $SV = new PerlACE::Process ("server", "-s $iorfile1 -c $iorfile2 $server_args");