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

10 files changed, 34 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 868ad0da7f1..0cbbeeee3f0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Tue Apr 17 07:46:12 UTC 2007 Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1476_Regression/run_test.pl:
+        * tests/Bug_2084_Regression/run_test.pl:
+        * tests/Bug_2494_Regression/run_test.pl:
+        * tests/Collocation/run_test.pl:
+        * tests/IORManipulation/run_test.pl:
+        * tests/Native_Exceptions/run_test.pl:
+        * tests/Optimized_Connection/run_test.pl:
+        * tests/Queued_Message_Test/run_test.pl:
+        * tests/Stack_Recursion/run_test.pl:
+          Corrected these scripts for VxWorks cross host testing
+
 Tue Apr 17 07:33:12 UTC 2007 Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_1476_Regression/run_test.pl:
diff --git a/TAO/tests/Bug_1476_Regression/run_test.pl b/TAO/tests/Bug_1476_Regression/run_test.pl
index 8175930ea49..af7c95742a9 100755
--- a/TAO/tests/Bug_1476_Regression/run_test.pl
+++ b/TAO/tests/Bug_1476_Regression/run_test.pl
@@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$baseior = "server.ior"
+$baseior = "server.ior";
 $iorfile = PerlACE::LocalFile ($baseior);
 unlink $iorfile;
 
diff --git a/TAO/tests/Bug_2084_Regression/run_test.pl b/TAO/tests/Bug_2084_Regression/run_test.pl
index 788c01a15ed..563f7bf7441 100755
--- a/TAO/tests/Bug_2084_Regression/run_test.pl
+++ b/TAO/tests/Bug_2084_Regression/run_test.pl
@@ -21,7 +21,7 @@ else {
 
 print STDERR "======== Running in Default Mode \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile");
-$sv = $SV->SpawnWaitKill (30);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in Collocated_Test\n";
@@ -31,7 +31,7 @@ unlink $iorfile;
 
 print STDERR "======== Running with per-orb \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (30);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in server\n";
@@ -41,7 +41,7 @@ unlink $iorfile;
 
 print STDERR "======== Running with no collocation \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation no");
-$sv = $SV->SpawnWaitKill (30);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in server\n";
@@ -51,7 +51,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in default mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n ");
-$sv = $SV->SpawnWaitKill (30);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in server\n";
@@ -61,7 +61,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in per-orb mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (30);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in server\n";
@@ -71,7 +71,7 @@ unlink $iorfile;
 
 print STDERR "======== Running in no collocation mode and two ORBS \n";
 $SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (30);
+$sv = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($sv != 0) {
     print STDERR "ERROR in server\n";
diff --git a/TAO/tests/Bug_2494_Regression/run_test.pl b/TAO/tests/Bug_2494_Regression/run_test.pl
index 17eb29446fe..c626288f860 100755
--- a/TAO/tests/Bug_2494_Regression/run_test.pl
+++ b/TAO/tests/Bug_2494_Regression/run_test.pl
@@ -11,7 +11,7 @@ use PerlACE::Run_Test;
 $status = 0;
 $srv_threads = '4';
 $cli_threads = '30';
-$baseior = "test.ior"
+$baseior = "test.ior";
 $iorfile = PerlACE::LocalFile ($baseior);
 $srvdownfile = PerlACE::LocalFile ("server_terminated");
 
diff --git a/TAO/tests/Collocation/run_test.pl b/TAO/tests/Collocation/run_test.pl
index cf072cd7bd3..b8563f357da 100755
--- a/TAO/tests/Collocation/run_test.pl
+++ b/TAO/tests/Collocation/run_test.pl
@@ -23,7 +23,7 @@ else {
 $server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
-    print STDERR "ERROR: Collocation returned $server \n";
+    print STDERR "ERROR: Collocation returned $server\n";
     $status = 1;
 }
 
diff --git a/TAO/tests/IORManipulation/run_test.pl b/TAO/tests/IORManipulation/run_test.pl
index b68b78b6af5..e2df5613d0e 100755
--- a/TAO/tests/IORManipulation/run_test.pl
+++ b/TAO/tests/IORManipulation/run_test.pl
@@ -15,7 +15,7 @@ else {
     $T = new PerlACE::Process ("IORTest");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/Native_Exceptions/run_test.pl b/TAO/tests/Native_Exceptions/run_test.pl
index 374f7c96aee..677bea63f57 100755
--- a/TAO/tests/Native_Exceptions/run_test.pl
+++ b/TAO/tests/Native_Exceptions/run_test.pl
@@ -8,6 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+$baseior = "test.ior";
 $iorfile = PerlACE::LocalFile ("test.ior");
 
 unlink $iorfile;
diff --git a/TAO/tests/Optimized_Connection/run_test.pl b/TAO/tests/Optimized_Connection/run_test.pl
index e8bfa227e41..43f0631bf33 100755
--- a/TAO/tests/Optimized_Connection/run_test.pl
+++ b/TAO/tests/Optimized_Connection/run_test.pl
@@ -8,11 +8,18 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("oc.ior");
+$baseior = "oc.ior";
+$iorfile = PerlACE::LocalFile ($baseior);
 $status = 0;
 
+if (PerlACE::is_vxworks_test()) {
+$CL_ALT_IIOP = new PerlACE::ProcessVX ("client", " -k file://$baseior " .
+                                     "-orbsvcconf oc_svc.conf");
+}
+else {
 $CL_ALT_IIOP = new PerlACE::Process ("client", " -k file://$iorfile " .
                                      "-orbsvcconf oc_svc.conf");
+}
 
 if (PerlACE::waitforfile_timed ($iorfile,
                         $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/tests/Queued_Message_Test/run_test.pl b/TAO/tests/Queued_Message_Test/run_test.pl
index f299f289253..d62dc78eda3 100755
--- a/TAO/tests/Queued_Message_Test/run_test.pl
+++ b/TAO/tests/Queued_Message_Test/run_test.pl
@@ -17,7 +17,7 @@ else {
     $T = new PerlACE::Process ("Queued_Message_Test");
 }
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
diff --git a/TAO/tests/Stack_Recursion/run_test.pl b/TAO/tests/Stack_Recursion/run_test.pl
index eff14fc2817..48a82da0241 100755
--- a/TAO/tests/Stack_Recursion/run_test.pl
+++ b/TAO/tests/Stack_Recursion/run_test.pl
@@ -24,7 +24,7 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;