ChangeLogTag:Tue May 9 20:37:29 2000 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 25 insertions, 26 deletions

diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index aab49207afa..c3c9ffe312f 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -52,9 +52,10 @@ Param_Test_Client<T>::run_sii_test (void)
   Options *opt = OPTIONS::instance (); // get the options
   const char *opname = this->test_object_->opname (); // operation
 
-  ACE_DEBUG ((LM_DEBUG,
-              "********** %s SII *********\n",
-              opname));
+  if (opt->debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                "********** %s SII *********\n",
+                opname));
 
   // Initialize call count and error count.
   this->results_.call_count (0);
@@ -145,7 +146,7 @@ Param_Test_Client<T>::run_sii_test (void)
                   "********** Error running %s SII *********\n",
                   opname));
     }
-  else
+  else if (opt->debug ())
     {
       ACE_DEBUG ((LM_DEBUG,
                   "********** Finished running %s SII *********\n",
@@ -160,9 +161,11 @@ Param_Test_Client<T>::run_dii_test (void)
 {
   const char *opname = this->test_object_->opname ();
   Options *opt = OPTIONS::instance ();
-  ACE_DEBUG ((LM_DEBUG,
-              "********** %s DII *********\n",
-              opname));
+
+  if (opt->debug ())
+    ACE_DEBUG ((LM_DEBUG,
+                "********** %s DII *********\n",
+                opname));
 
   // initialize call count and error count
   this->results_.call_count (0);
@@ -255,7 +258,7 @@ Param_Test_Client<T>::run_dii_test (void)
                   "********** Error running %s DII *********\n",
                   opname));
     }
-  else
+  else if (opt->debug ())
     {
       ACE_DEBUG ((LM_DEBUG,
                   "********** Finished running %s DII *********\n",
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index aafc54f6de4..8e5776cf89e 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -945,8 +945,6 @@ Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
 {
   Param_Test::Var_Array_slice *ret;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%N| %l) \n"));
   Param_Test::Var_Array_copy (a2, a1);
   a3 = Param_Test::Var_Array_dup (a1);
   ret = Param_Test::Var_Array_dup (a1);
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 76dece00dd2..da8e4698d30 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -41,7 +41,7 @@ Results::print_stats (void)
 
   CORBA::ULong i;
 
-  if (this->error_count_ == 0)
+  if (TAO_debug_level > 0 && this->error_count_ == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Iteration\tReal time (msec)\tUser time (msec)"
@@ -84,19 +84,20 @@ Results::print_stats (void)
                   (avg_system_time < 0.0? 0.0:avg_system_time),
                   (cps < 0.0? 0.0 : cps)));
 
+      ACE_DEBUG ((LM_DEBUG,
+                  "\t%d calls, %d errors\n"
+                  "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=\n",
+                  this->call_count_,
+                  this->error_count_));
     }
-  else
+  else if (this->error_count_ != 0)
     {
-      ACE_ERROR ((LM_ERROR,
-                  "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-
+      ACE_DEBUG ((LM_DEBUG,
+                  "\tERROR %d faults in %d calls\n"
+                  "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=\n",
+                  this->error_count_,
+                  this->call_count_));
     }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\t%d calls, %d errors\n"
-              "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=\n",
-              this->call_count_,
-              this->error_count_));
 }
 
 void
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 68ed2845747..93293c80355 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -136,7 +136,8 @@ main (int argc, char *argv[])
                                    ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) The IOR is <%s>\n", str.in ()));
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) The IOR is <%s>\n", str.in ()));
       if (ior_output_file)
         {
           ACE_OS::fprintf (ior_output_file, "%s", str.in());
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 5a83b39b5a0..ea7a29e70f9 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -109,14 +109,10 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref,
   ACE_TRY
     {
       Param_Test::Var_Array_out out_arr (this->out_.out ());
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%N|%l) \n"));
       this->ret_ = objref->test_var_array (this->in_,
                                            this->inout_,
                                            out_arr,
                                            ACE_TRY_ENV);
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%N|%l) \n"));
       ACE_TRY_CHECK;
 
       return 0;