Mon Apr 16 12:04:56 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 29 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c9541f81d36..7c115951eb8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Mon Apr 16 12:04:56 UTC 2007 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DIOP/run_test.pl:
+          Updated for VxWorks cross host testing
+
+        * tests/Persistent_ID/run_test.pl:
+          Use PerlACE::LocalFile
+
+        * tests/OctetSeq/run_test.pl:
+          Run the performance test on the target system when using
+          VxWorks cross host testing
+
+        * tests/Abstract_Interface/client.cpp:
+          No need to pass in an empty orb name
+
 Mon Apr 16 11:47:56 UTC 2007 Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Collocation_Exception_Test/run_test.pl:
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index 0fcf7680569..0e314cb7bd3 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -178,9 +178,7 @@ main (int argc, char *argv[])
 
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {
diff --git a/TAO/tests/DIOP/run_test.pl b/TAO/tests/DIOP/run_test.pl
index 26ee86cd773..02d64e146ce 100755
--- a/TAO/tests/DIOP/run_test.pl
+++ b/TAO/tests/DIOP/run_test.pl
@@ -11,14 +11,21 @@ use PerlACE::Run_Test;
 $ORBdebuglevel = 0;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ($iorbase);
 
-$SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:88888 -o $iorfile -ORBdebuglevel $ORBdebuglevel");
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:88888 -o $iorbase -ORBdebuglevel $ORBdebuglevel");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:88888 -o $iorfile -ORBdebuglevel $ORBdebuglevel");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index 1a1d85a134d..c6eb2cc159f 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -15,12 +15,13 @@ unlink $iorfile;
 
 if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
+    $T = new PerlACE::ProcessVX ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile");
+    $T = new PerlACE::Process ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q");
 }
 $CL = new PerlACE::Process ("client", "-i 5000 -k file://$iorfile");
-$T = new PerlACE::Process ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q");
 
 print STDERR "\n\n==== Octet sequence passing test\n";
 
diff --git a/TAO/tests/POA/Persistent_ID/run_test.pl b/TAO/tests/POA/Persistent_ID/run_test.pl
index fad92db6d08..96f6fbe4946 100755
--- a/TAO/tests/POA/Persistent_ID/run_test.pl
+++ b/TAO/tests/POA/Persistent_ID/run_test.pl
@@ -9,7 +9,7 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = "server.ior";
+$iorfile = PerlACE::LocalFile ("server.ior");
 
 unlink $iorfile;