Thu Nov 12 12:12:51 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/AMH_Exceptions/run_test.pl:
        * tests/AMI_Timeouts/run_test.pl:
        * tests/Portable_Interceptors/AdvSlot/run_test.pl:
        * tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl:
        * tests/Portable_Interceptors/Bug_2133/run_test.pl:
        * tests/Portable_Interceptors/Bug_3080/run_test.pl:
        * tests/Portable_Interceptors/Bug_3582/run_test.pl:
          Fixed fuzz

8 files changed, 19 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index eb276733e2e..6c61fe5b716 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Thu Nov 12 12:12:51 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMH_Exceptions/run_test.pl:
+        * tests/AMI_Timeouts/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlot/run_test.pl:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl:
+        * tests/Portable_Interceptors/Bug_2133/run_test.pl:
+        * tests/Portable_Interceptors/Bug_3080/run_test.pl:
+        * tests/Portable_Interceptors/Bug_3582/run_test.pl:
+          Fixed fuzz
+
 Thu Nov 12 08:24:00 UTC 2009  Denis Budko <denis.budko@remedy.nl>
 
         * tests/IORManipulation/filter/run_test.pl
diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl
index 9dac20d45b3..7eb6a94c149 100755
--- a/TAO/tests/AMH_Exceptions/run_test.pl
+++ b/TAO/tests/AMH_Exceptions/run_test.pl
@@ -55,7 +55,7 @@ if ($host->PutFile ($iorbase) == -1) {
 }
 
 # Run client.
-$client_status = $CL->SpawnWaitKill (30);
+$client_status = $CL->SpawnWaitKill ($host->ProcessStartWaitInterval() + 15);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/AMI_Timeouts/run_test.pl b/TAO/tests/AMI_Timeouts/run_test.pl
index 78dd9266dac..78f3589135a 100755
--- a/TAO/tests/AMI_Timeouts/run_test.pl
+++ b/TAO/tests/AMI_Timeouts/run_test.pl
@@ -45,8 +45,8 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill (120);
-$server_status = $SV->TerminateWaitKill (5);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+$server_status = $SV->TerminateWaitKill ($server->ProcessStartWaitInterval());
 
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
index ae408c13657..9652bcfd860 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
@@ -43,7 +43,7 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 56);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 56);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
index 994fbe5d728..107c5baad6a 100755
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
@@ -43,7 +43,7 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_2133/run_test.pl
index db925f4efe1..5691617f53d 100755
--- a/TAO/tests/Portable_Interceptors/Bug_2133/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/run_test.pl
@@ -53,7 +53,7 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_3080/run_test.pl
index 2fc3339afac..3266ee2e6bd 100755
--- a/TAO/tests/Portable_Interceptors/Bug_3080/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/run_test.pl
@@ -53,7 +53,7 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_3582/run_test.pl
index 0961c9a15f8..aa29a48c83b 100755
--- a/TAO/tests/Portable_Interceptors/Bug_3582/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/run_test.pl
@@ -58,7 +58,7 @@ if ($server_status != 0) {
 
 print "Restarting Client to provoke TRANSIENT exception\n";
 
-$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";