Tue Mar 6 08:59:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

25 files changed, 57 insertions, 29 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4a66b052b81..25a7c0252ef 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,31 @@
+Tue Mar  6 08:59:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Codec/run_test.pl:
+        * tests/POA/Bug_1592_Regression/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlot/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlotExt/run_test.pl:
+        * tests/Portable_Interceptors/Benchmark/run_test.pl:
+        * tests/Portable_Interceptors/Bug_1559/run_test.pl:
+        * tests/Portable_Interceptors/Bug_2088/run_test.pl:
+        * tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl:
+        * tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl:
+        * tests/Portable_Interceptors/Dynamic/run_test.pl:
+        * tests/Portable_Interceptors/ForwardRequest/run_test.pl:
+        * tests/Portable_Interceptors/IORInterceptor/run_test.pl:
+        * tests/Portable_Interceptors/ORB_Shutdown/run_test.pl:
+        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+        * tests/Portable_Interceptors/PolicyFactory/run_test.pl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl:
+        * tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl:
+        * tests/Portable_Interceptors/Redirection/run_test.pl:
+        * tests/Portable_Interceptors/Register_Initial_References/run_test.pl:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl:
+        * tests/Portable_Interceptors/Slot/run_test.pl:
+          Use a PerlACE variable for the time to wait for a process
+
 Tue Mar  6 08:15:32 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Any/Recursive/Test.idl:
diff --git a/TAO/tests/Codec/run_test.pl b/TAO/tests/Codec/run_test.pl
index e38457ac605..35f1fec05f4 100755
--- a/TAO/tests/Codec/run_test.pl
+++ b/TAO/tests/Codec/run_test.pl
@@ -17,7 +17,7 @@ else {
     $T = new PerlACE::Process ("client");
 }
 
-$test = $T->SpawnWaitKill (15);
+$test = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($test != 0) {
     print STDERR "ERROR: Codec test returned $test\n";
diff --git a/TAO/tests/POA/Bug_1592_Regression/run_test.pl b/TAO/tests/POA/Bug_1592_Regression/run_test.pl
index 9c8a8a4be5e..35c9cdd7798 100755
--- a/TAO/tests/POA/Bug_1592_Regression/run_test.pl
+++ b/TAO/tests/POA/Bug_1592_Regression/run_test.pl
@@ -23,7 +23,7 @@ print STDERR "\n\n==== Running PortableInterceptor / ServantLocator test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
index 0493f6e38a8..a8d26f91726 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running advanced slot test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
index b71142646b0..f74e6b4385e 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running advanced slot double copy test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
index 0493f6e38a8..a8d26f91726 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running advanced slot test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl b/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
index 3db12f46a72..b4153cfdbbf 100755
--- a/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
@@ -20,9 +20,9 @@ print STDERR "\n\n==== Running interceptor Benchmark test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill (); 
+    $SV->Kill ();
     exit 1;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl
index 0c844fbab03..390e49fcd46 100755
--- a/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl
index a9f35114c58..914334569bd 100755
--- a/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running bug 2088 test\n";
 
-$client = $CL->SpawnWaitKill (5);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
index 0c844fbab03..390e49fcd46 100755
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
index 1f521f276eb..2a580aaddb6 100755
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl
@@ -24,7 +24,7 @@ print STDERR "\n\n==== Running interceptor collocated Dynamic test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
index 72dbbde1fe4..d9dffab2446 100755
--- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor Dynamic test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
index d8e2b3730eb..08237e0c82e 100755
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
@@ -20,7 +20,7 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o test1.ior -o test2.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $file1 -o $file2");    
+    $SV = new PerlACE::Process ("server", "-o $file1 -o $file2");
 }
 $CL = new PerlACE::Process ("client", "-k file://$file1 -k file://$file2");
 
@@ -30,13 +30,13 @@ print STDERR "\n\n==== Running PortableInterceptor::ForwardRequest test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file1>\n";
     $SV->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($file2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file2>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
index 88d843a1a96..6500f127a9a 100755
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running IORInterceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl b/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl
index 4c2bce37aaa..b91680b765b 100755
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl
@@ -18,7 +18,7 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $file");    
+    $SV = new PerlACE::Process ("server", "-o $file");
 }
 $CL = new PerlACE::Process ("client", "-k file://$file");
 
@@ -28,7 +28,7 @@ print STDERR "\n\n==== Running PortableInterceptor ORB::shutdown() test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
index 64932b1e51d..1f767aa5fe2 100755
--- a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl
@@ -30,7 +30,7 @@ sub DoTest
   unlink $file;
   $SV->Spawn ();
 
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+  if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
       print STDERR "ERROR: cannot find file <$file>\n";
       $SV->Kill (); 
       return 1;
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
index c82b4816ef0..601d939e2f1 100755
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
@@ -22,7 +22,7 @@ print STDERR "\n\n==== Running PolicyFactory test\n";
 
 $SV->Spawn ();
 
-$server = $SV->WaitKill (30);
+$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
index f735449a7cc..94350489e4c 100755
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
@@ -102,7 +102,7 @@ for ($testid = 1; $testid <= 9; ++$testid)
 
   $SV->Spawn ();
 
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+  if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
       print STDERR "ERROR: cannot find file <$file>\n";
       $SV->Kill ();
       exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
index b75e3b99bb6..973e4aaa9e7 100755
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
@@ -105,7 +105,7 @@ for ($testid = 1; $testid <= 9; ++$testid)
       exit 1;
   }
 
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+  if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
       print STDERR "ERROR: cannot find file <$file>\n";
       $SV->Kill ();
       exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl
index 13e1a0fec8c..721bc165e84 100755
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running Recursive ORBInitializer test ====\n";
 
-$client = $CL->SpawnWaitKill (5);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
diff --git a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
index 024921a57cd..87f26315099 100755
--- a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl
@@ -27,13 +27,13 @@ print STDERR "\n\n==== Running PortableInterceptor::Redirection test\n";
 $SV1->Spawn ();
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file1, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file1, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file1>\n";
     $SV1->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($file2, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file2, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file2>\n";
     $SV2->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl b/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
index 6484616e7f6..70a7b4b8656 100755
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running Register_Initial_References test ====\n";
 
-$server = $SV->SpawnWaitKill (30);
+$server = $SV->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
index b81cef5bf37..98f96a2bb44 100755
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running Request_Interceptor_Flow test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
index 0c844fbab03..390e49fcd46 100755
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
@@ -25,7 +25,7 @@ print STDERR "\n\n==== Running interceptor test\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
+if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$file>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Slot/run_test.pl b/TAO/tests/Portable_Interceptors/Slot/run_test.pl
index 6a114e0b6cd..d36d2cb27e2 100755
--- a/TAO/tests/Portable_Interceptors/Slot/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Slot/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running Slot test ====\n";
 
-$client = $CL->SpawnWaitKill (5);
+$client = $CL->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation);
 
 if ($client != 0) {
     print STDERR "ERROR: driver returned $client\n";