Tue Apr 17 08:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 15 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0cbbeeee3f0..86cfb6537cb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Apr 17 08:14:12 UTC 2007 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2678_Regression/run_test.pl:
+        * tests/Bug_2683_Regression/run_test.pl:
+        * tests/DIOP/run_test.pl:
+        * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl:
+        * tests/InterOp-Naming/run_test.pl:
+          Fixed variable to be used for VxWorks target name
+
 Tue Apr 17 07:46:12 UTC 2007 Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_1476_Regression/run_test.pl:
diff --git a/TAO/tests/Bug_2678_Regression/run_test.pl b/TAO/tests/Bug_2678_Regression/run_test.pl
index 959c013ea85..1e3ffd83ad8 100755
--- a/TAO/tests/Bug_2678_Regression/run_test.pl
+++ b/TAO/tests/Bug_2678_Regression/run_test.pl
@@ -18,7 +18,7 @@ $endien = (pack('L', 0x41424344) eq 'ABCD' ? '_be' : '');
 unlink $iorfile;
 
 if (PerlACE::is_vxworks_test()) {
-    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
+    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
     $SV = new PerlACE::ProcessVX ('server',
                              '-ORBEndpoint ' .
                              "iiop://$TARGETHOSTNAME" . ":$port " .
diff --git a/TAO/tests/Bug_2683_Regression/run_test.pl b/TAO/tests/Bug_2683_Regression/run_test.pl
index 2fa15818757..19fca5aec8f 100755
--- a/TAO/tests/Bug_2683_Regression/run_test.pl
+++ b/TAO/tests/Bug_2683_Regression/run_test.pl
@@ -21,7 +21,7 @@ unlink $iorfile;
 $TARGETHOSTNAME = "localhost";
 
 if (PerlACE::is_vxworks_test()) {
-    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
+    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
     $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210");
 }
 else {
diff --git a/TAO/tests/DIOP/run_test.pl b/TAO/tests/DIOP/run_test.pl
index d9ab678d070..58b0503b905 100755
--- a/TAO/tests/DIOP/run_test.pl
+++ b/TAO/tests/DIOP/run_test.pl
@@ -15,7 +15,7 @@ $iorbase = "test.ior";
 $iorfile = PerlACE::LocalFile ($iorbase);
 
 if (PerlACE::is_vxworks_test()) {
-  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
   $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:88888 -o $iorbase -ORBdebuglevel $ORBdebuglevel");
 }
 else {
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
index b5d61782e3b..ebcc41eabc4 100755
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
@@ -18,7 +18,7 @@ $endien = (pack('L', 0x41424344) eq 'ABCD' ? '_be' : '');
 unlink $iorfile;
 
 if (PerlACE::is_vxworks_test()) {
-    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
+    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
     $SV = new PerlACE::ProcessVX ('server',
                              '-ORBEndpoint ' .
                              "iiop://$TARGETHOSTNAME" . ":$port " .
diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl
index 6146cd69acf..178316c7c2b 100755
--- a/TAO/tests/InterOp-Naming/run_test.pl
+++ b/TAO/tests/InterOp-Naming/run_test.pl
@@ -19,7 +19,7 @@ print STDERR "\n\n==== InitRef test\n";
 
 unlink $file;
 if (PerlACE::is_vxworks_test()) {
-    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'};
+    $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
     $SV = new PerlACE::ProcessVX ("INS_test_server",
                         "-ORBEndpoint iiop://1.0@"."$TARGETHOSTNAME:$port "
                         . " -i object_name -o test.ior -ORBDottedDecimalAddresses 1");
@@ -34,7 +34,7 @@ $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($file, 10) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill (); 
+    $SV->Kill ();
     exit 1;
 }