From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 13 Dec 2013 19:18:17 +0000 (+0000)
Subject: take over r31987
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f225fe25c0654780f3818f2603a8733364c9d38d;p=dealii-svn.git

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 8f6c6b5456..ee1ec3c864 100644
--- 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 0d803b3caa..0de35217a9 100644
--- 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