Mon Nov 12 13:59:21 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 33 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d51e37de5a5..c9f0c3c3826 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 12 13:59:21 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2174_Regression/run_test.pl:
+        * tests/Bug_2183_Regression/run_test.pl:
+        * tests/Bug_2234_Regression/run_test.pl:
+        * tests/Bug_2328_Regression/run_test.pl:
+        * tests/Bug_2804_Regression/run_test.pl:
+          Improved VxWorks cross platform testing
+
 Mon Nov 12 13:02:21 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_1361_Regression/run_test.pl:
diff --git a/TAO/tests/Bug_2174_Regression/run_test.pl b/TAO/tests/Bug_2174_Regression/run_test.pl
index 2cb0ad75401..0c97124f055 100755
--- a/TAO/tests/Bug_2174_Regression/run_test.pl
+++ b/TAO/tests/Bug_2174_Regression/run_test.pl
@@ -8,13 +8,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfilebase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 # Test A: object exists (_non_existent() returns false)
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile");
@@ -46,7 +47,7 @@ if ($client != 2) {
 # Test B: object does not exist (_non_existent() returns true)
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -r");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase -r");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile -r");
diff --git a/TAO/tests/Bug_2183_Regression/run_test.pl b/TAO/tests/Bug_2183_Regression/run_test.pl
index c8bd9248b1b..0b695f5d9c0 100755
--- a/TAO/tests/Bug_2183_Regression/run_test.pl
+++ b/TAO/tests/Bug_2183_Regression/run_test.pl
@@ -9,15 +9,14 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 # The server IOR file
-$server_ior_file = PerlACE::LocalFile ("server.ior");
+$server_ior_file_base = "server.ior";
+$server_ior_file = PerlACE::LocalFile ("$server_ior_file_base");
 
 # The client and server processes
-if (PerlACE::is_vxworks_test()) {
-  $SERVER     = new PerlACE::ProcessVX(PerlACE::LocalFile("server"));
-}
-else {
-  $SERVER     = new PerlACE::Process(PerlACE::LocalFile("server"));
-}
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+                                          'PerlACE::Process');
+$SERVER = new $class ("server");
+
 $perl_executable = $^X;
 $perl_executable =~ s/\.exe//ig;
 if ($^O == 'VMS') {
@@ -30,7 +29,7 @@ $DUMMY_CLIENT->Arguments("hang_client.pl");
 $DUMMY_CLIENT->IgnoreExeSubDir(1);
 
 if (PerlACE::is_vxworks_test()) {
-  $SERVER->Arguments("-o server.ior -ORBEndpoint iiop://:15000 -ORBSvcConf server.conf");
+  $SERVER->Arguments("-o $server_ior_file_base -ORBEndpoint iiop://:15000 -ORBSvcConf server.conf");
 }
 else {
   $SERVER->Arguments("-o $server_ior_file -ORBEndpoint iiop://:15000 -ORBSvcConf server.conf");
diff --git a/TAO/tests/Bug_2234_Regression/run_test.pl b/TAO/tests/Bug_2234_Regression/run_test.pl
index a680efe316f..0ed4fa01026 100755
--- a/TAO/tests/Bug_2234_Regression/run_test.pl
+++ b/TAO/tests/Bug_2234_Regression/run_test.pl
@@ -14,14 +14,11 @@ $server_ior_file= PerlACE::LocalFile( "server.ior" );
 unlink $server_ior_file;
 
 # The client and server processes
-if (PerlACE::is_vxworks_test()) {
-    $SERVER= new PerlACE::ProcessVX( PerlACE::LocalFile( "server" ) );
-}
-else {
-    $SERVER= new PerlACE::Process( PerlACE::LocalFile( "server" ) );
-}
-$CLIENT= new PerlACE::Process( PerlACE::LocalFile( "client" ) );
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+                                          'PerlACE::Process');
+$SERVER = new $class ("server");
 
+$CLIENT= new PerlACE::Process( PerlACE::LocalFile( "client" ) );
 
 # Fire up the server
 $sv = $SERVER->Spawn();
diff --git a/TAO/tests/Bug_2328_Regression/run_test.pl b/TAO/tests/Bug_2328_Regression/run_test.pl
index a1bb988ec23..3a03a5bac3c 100755
--- a/TAO/tests/Bug_2328_Regression/run_test.pl
+++ b/TAO/tests/Bug_2328_Regression/run_test.pl
@@ -10,17 +10,18 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfilebase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile");
 }
 $CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBNegotiateCodesets 0");
-    
+
 $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile,
@@ -28,7 +29,7 @@ if (PerlACE::waitforfile_timed ($iorfile,
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (300);
 
@@ -37,7 +38,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (10);
+$server = $SV->WaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Bug_2804_Regression/run_test.pl b/TAO/tests/Bug_2804_Regression/run_test.pl
index 929281e6f9b..8def363eca2 100755
--- a/TAO/tests/Bug_2804_Regression/run_test.pl
+++ b/TAO/tests/Bug_2804_Regression/run_test.pl
@@ -10,13 +10,14 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfilebase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 print STDERR "\n\n==== Bug 2804_Regression\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorfilebase");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $iorfile");