ChangeLogTag: Wed Jan 29 12:15:31 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

3 files changed, 13 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 15b12997f52..3a14745b502 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jan 29 12:15:31 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tests/Bug_1361_Regression/run_test.pl: Reduced the number of
+	  iterations  that this test runs. Removed -ORBdebuglevel from teh
+	  scripts. This was used for debugging purposes long back.
+	
+	* tests/Bug_1361_Regression/Server_Thread_Pool.cpp: Removed a
+	  debug statement where we print exceptions. This is expected in
+	  this test.
+
 Tue Jan 28 15:59:45 2003  Priyanka Gontla  <pgontla@ece.uci.edu>
 
 	* docs/Options.html: 
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 2a102544b5c..78f5738b4af 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -160,8 +160,7 @@ Thread_Pool::svc (void)
             }
           ACE_CATCHANY
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Exception caught in Thread_Pool::svc ():");
+	      // Just forget the exception and continue	
             }
           ACE_ENDTRY;
         }
diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl
index eede9207aab..9e74ef51116 100755
--- a/TAO/tests/Bug_1361_Regression/run_test.pl
+++ b/TAO/tests/Bug_1361_Regression/run_test.pl
@@ -9,14 +9,10 @@ use lib '../../../bin';
 use PerlACE::Run_Test;
 use POSIX "sys_wait_h";
 
-$ENV{"PURIFYOPTIONS"}='-report-pmrs=no -leaks-at-exit=no -fds-inuse-at-exit=no -inuse-at-exit=no -thread-report-at-exit=no -search-mmaps -max_threads=200 -chain-length=20 -free-queue-length=200 -freeze-on-error=no -windows=yes -log-file=./%v-%p.pure.log -output-limit=20000000000 -show-directory -add-suppression-files=/home/dbinder/work/PURIFY-MT-SUPPRESSIONS';
-
 $iorfile = PerlACE::LocalFile ("server$$.ior");
 unlink $iorfile;
 
-$debuglevel = int (rand() * 6) + 1;
-
-$SV = new PerlACE::Process ("server", " -o $iorfile -ORBDebugLevel $debuglevel -ORBLogFile server.log");
+$SV = new PerlACE::Process ("server", " -o $iorfile");
 $threads = int (rand() * 6) + 1;
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -t $threads");
 
@@ -30,7 +26,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 250) == -1) {
 }
 
 local $start_time = time();
-local $max_running_time = 20 * 60;
+local $max_running_time = 360;
 local $elapsed = time() - $start_time;
 my $p = $SV->{'PROCESS'};