Wed Dec 12 14:27:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 11 insertions, 4 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e0149ce2409..7b83933ea9f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 12 14:27:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Redirection/run_test.pl:
+          Improved this script for VxWorks
+
 Wed Dec 12 14:20:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Portable_Interceptors/Bug_3079/run_test.pl:
diff --git a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
index 885806bbdce..89aeae50a11 100755
--- a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
@@ -10,14 +10,15 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$file1 = PerlACE::LocalFile ("test1.ior");
+$file1base = "test.ior";
+$file1 = PerlACE::LocalFile ("$file1base");
 $file2 = PerlACE::LocalFile ("test2.ior");
 
 unlink $file1;
 unlink $file2;
 
 if (PerlACE::is_vxworks_test()) {
-$SV1 = new PerlACE::ProcessVX ("server", "-o test1.ior -c 1 -n 1");
+$SV1 = new PerlACE::ProcessVX ("server", "-o $file1base -c 1 -n 1");
 }
 else {
 $SV1 = new PerlACE::Process ("server", "-o $file1 -c 1 -n 1");
@@ -30,7 +31,6 @@ $status = 0;
 print STDERR "\n\n==== Running PortableInterceptor::Redirection test\n";
 
 $SV1->Spawn ();
-$SV2->Spawn ();
 
 if (PerlACE::waitforfile_timed ($file1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file1>\n";
@@ -38,6 +38,8 @@ if (PerlACE::waitforfile_timed ($file1, $PerlACE::wait_interval_for_process_crea
     exit 1;
 }
 
+$SV2->Spawn ();
+
 if (PerlACE::waitforfile_timed ($file2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file2>\n";
     $SV2->Kill ();
@@ -67,7 +69,7 @@ if ($server1 != 0) {
     }
 }
 
-$server2 = $SV2->WaitKill (5);
+$server2 = $SV2->WaitKill (15);
 
 if ($server2 != 0) {
     print STDERR "ERROR: server2 returned $server2\n";