take over r31987

git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-1@31990 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/base/timer_02.cc b/tests/base/timer_02.cc
index 8f6c6b54565c9fbbb3d9ec7d637541ac398d4319..ee1ec3c864ef31e4007389b609b048655dd89a5a 100644 (file)
--- a/tests/base/timer_02.cc
+++ b/tests/base/timer_02.cc
@@ -36,8 +36,10 @@ int main ()
   deallog.threshold_double(1.e-1);
 
   {
-
-    TimerOutput t(logfile, TimerOutput::summary, TimerOutput::cpu_times);
+    
+    // use std::cout so that no output is saved to the logfile, because it
+    // is difficult to test (timing)
+    TimerOutput t(std::cout, TimerOutput::summary, TimerOutput::cpu_times);
 
     t.enter_subsection("hi");
     t.leave_subsection("hi");

diff --git a/tests/base/timer_02.output b/tests/base/timer_02.output
index 0d803b3caae7409ea01744ba21de7728ccd25931..0de35217a9c3d15480c51b59a93c7946ac6de6fd 100644 (file)
--- a/tests/base/timer_02.output
+++ b/tests/base/timer_02.output
@@ -1,12 +1,2 @@
 
-
-
-+---------------------------------------------+------------+------------+
-| Total CPU time elapsed since start          |      0.00s |            |
-|                                             |            |            |
-| Section                         | no. calls |  CPU time  | % of total |
-+---------------------------------+-----------+------------+------------+
-| hi                              |         1 |      0.00s |       0.0% |
-+---------------------------------+-----------+------------+------------+
-
 DEAL::ok