Wed Jul 25 07:50:23 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 111 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3966e1ba407..77882d781d6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Wed Jul 25 07:50:23 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/Adapter_Activator/run_test.pl:
+        * examples/POA/Default_Servant/run_test.pl:
+        * examples/POA/DSI/run_test.pl:
+        * examples/POA/Explicit_Activation/run_test.pl:
+        * examples/POA/FindPOA/run_test.pl:
+        * examples/POA/Loader/run_test.pl:
+        * examples/POA/NewPOA/run_test.pl:
+        * examples/POA/On_Demand_Activation/run_test.pl:
+        * examples/POA/On_Demand_Loading/run_test.pl:
+        * examples/POA/POA_BiDir/run_test.pl:
+        * examples/POA/Reference_Counted_Servant/run_test.pl:
+        * examples/POA/RootPOA/run_test.pl:
+        * examples/POA/TIE/run_test.pl:
+          Added support for VxWorks cross platform testing
+
 Tue Jul 24 19:58:38 UTC 2007  Ciju John  <johnc at ociweb dot com>
 
         * tests/Bug_3000_Regression:
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index e6420cec3d2..9eedbf90455 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorbase = "ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 $status = 0;
 $oneway = "";
@@ -51,7 +52,12 @@ unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-f $iorbase $extra_args");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+}
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
 $server = $SV->Spawn ();
@@ -106,7 +112,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl
index 377f2a1146e..85ea109f4c6 100755
--- a/TAO/examples/POA/DSI/run_test.pl
+++ b/TAO/examples/POA/DSI/run_test.pl
@@ -9,11 +9,17 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorbase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-f $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-f $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-f $iorfile -x");
 
 $SV->Spawn ();
@@ -25,7 +31,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_cr
 }
 
 $client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill (15);
 
 unlink $iorfile;
 
diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl
index 83b273d7b95..5ac1d13b1b3 100755
--- a/TAO/examples/POA/Default_Servant/run_test.pl
+++ b/TAO/examples/POA/Default_Servant/run_test.pl
@@ -8,12 +8,18 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorbase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 $status = 0;
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k $iorfile");
 
 $server = $SV->Spawn ();
diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index 9ebf7650f5f..913b6763afb 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorbase = "ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 $oneway = "";
 $iterations = 100;
@@ -52,7 +53,12 @@ unlink $iorfile_3;
 
 $status = 0;
 
+if (PerlACE::is_vxworks_test()) {
+$SV = new PerlACE::ProcessVX ("server", "-f $iorbase $extra_args");
+}
+else {
 $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+}
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
 $server = $SV->Spawn ();
diff --git a/TAO/examples/POA/FindPOA/run_test.pl b/TAO/examples/POA/FindPOA/run_test.pl
index 3b048dafd55..494c5116169 100755
--- a/TAO/examples/POA/FindPOA/run_test.pl
+++ b/TAO/examples/POA/FindPOA/run_test.pl
@@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+if (PerlACE::is_vxworks_test()) {
+$T = new PerlACE::ProcessVX ("FindPOA");
+}
+else {
 $T = new PerlACE::Process ("FindPOA");
+}
 
 $test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index f304108f73f..559d008288d 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorbase = "ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 $status = 0;
 $oneway = "";
@@ -49,7 +50,12 @@ $iorfile_2 = $iorfile."_2";
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-f $iorbase $extra_args");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+}
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
 $server = $SV->Spawn ();
diff --git a/TAO/examples/POA/NewPOA/run_test.pl b/TAO/examples/POA/NewPOA/run_test.pl
index 68e217ee405..f3c1f7fc5d1 100755
--- a/TAO/examples/POA/NewPOA/run_test.pl
+++ b/TAO/examples/POA/NewPOA/run_test.pl
@@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$T = new PerlACE::Process ("NewPOA");
+if (PerlACE::is_vxworks_test()) {
+  $T = new PerlACE::ProcessVX ("NewPOA");
+}
+else {
+  $T = new PerlACE::Process ("NewPOA");
+}
 
 $test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index 1b624e5b33b..c3d80c769f4 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorbase = "ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 $oneway = "";
 $iterations = 100;
@@ -48,7 +49,12 @@ $iorfile_2 = $iorfile."_2";
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-f $iorbase $extra_args");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+}
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
 $status = 0;
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 41559f4ba25..d25948c1ce4 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -49,7 +49,12 @@ $iorfile2 = $iorfile."_2";
 
 unlink $iorfile1, $iorfile2;
 
-$SV  = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+if (PerlACE::is_vxworks_test()) {
+  $SV  = new PerlACE::ProcessVX ("server", "-f $iorfile $extra_args");
+}
+else {
+  $SV  = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+}
 $CL1 = new PerlACE::Process ("../Generic_Servant/client", 
                              "$extra_args $oneway -i $iterations -k file://$iorfile1");
 $CL2 = new PerlACE::Process ("../Generic_Servant/client",
diff --git a/TAO/examples/POA/POA_BiDir/run_test.pl b/TAO/examples/POA/POA_BiDir/run_test.pl
index c56bd463c57..aa5766b6093 100755
--- a/TAO/examples/POA/POA_BiDir/run_test.pl
+++ b/TAO/examples/POA/POA_BiDir/run_test.pl
@@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$T = new PerlACE::Process ("POA_BiDir");
+if (PerlACE::is_vxworks_test()) {
+  $T = new PerlACE::ProcessVX ("POA_BiDir");
+}
+else {
+  $T = new PerlACE::Process ("POA_BiDir");
+}
 
 $test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
index f83ff34b970..38c3a37edf3 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("poa.ior");
+$iorbase = "poa.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 $oneway = "";
 $iterations = 100;
@@ -44,7 +45,12 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-f $iorbase $extra_args");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
+}
 $CL = new PerlACE::Process ("../Generic_Servant/client", "$extra_args $oneway -i $iterations -k file://$iorfile -x");
 
 $status = 0;
diff --git a/TAO/examples/POA/RootPOA/run_test.pl b/TAO/examples/POA/RootPOA/run_test.pl
index 0f45dd22fc5..8c31ab60d50 100755
--- a/TAO/examples/POA/RootPOA/run_test.pl
+++ b/TAO/examples/POA/RootPOA/run_test.pl
@@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$T = new PerlACE::Process ("RootPOA");
+if (PerlACE::is_vxworks_test()) {
+  $T = new PerlACE::ProcessVX ("RootPOA");
+}
+else {
+  $T = new PerlACE::Process ("RootPOA");
+}
 
 $test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
diff --git a/TAO/examples/POA/TIE/run_test.pl b/TAO/examples/POA/TIE/run_test.pl
index e18329ba492..e36559da87c 100755
--- a/TAO/examples/POA/TIE/run_test.pl
+++ b/TAO/examples/POA/TIE/run_test.pl
@@ -10,7 +10,8 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorbase = "ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 $iorfile_1 = $iorfile."_1";
 $iorfile_2 = $iorfile."_2";
@@ -26,7 +27,12 @@ unlink $iorfile_4;
 unlink $iorfile_5;
 unlink $iorfile_6;
 
-$SV = new PerlACE::Process ("server");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server");
+}
+else {
+  $SV = new PerlACE::Process ("server");
+}
 $CL1 = new PerlACE::Process ("client",
                              "-a file://$iorfile_1 -b file://$iorfile_2 -c file://$iorfile_3 -d file://$iorfile_4");
 $CL2 = new PerlACE::Process ("client", "-e file://$iorfile_5 -f file://$iorfile_6");