libtest: improve output format; makes eyes hurt less

[awesomized/libmemcached] / libtest / collection.cc

diff --git a/libtest/collection.cc b/libtest/collection.cc
index 86e7f864a922c4034cf29f32b1495d660be9bcd0..0b2b32492230b3f83c22229291eaeb2fdce1804f 100644 (file)
--- a/libtest/collection.cc
+++ b/libtest/collection.cc
@@ -51,6 +51,9 @@ static test_return_t runner_code(libtest::Framework* frame,
   try 
   {
     _timer.reset();
+    assert(frame);
+    assert(frame->runner());
+    assert(run->test_fn);
     return_code= frame->runner()->main(run->test_fn, frame->creators_ptr());
   }
   // Special case where check for the testing of the exception
@@ -135,9 +138,9 @@ test_return_t Collection::exec()
       }
       catch (const libtest::fatal& e)
       {
-        stream::cerr(e.file(), e.line(), e.func()) << e.what();
         _failed++;
         formatter()->failed();
+        stream::make_cerr(e.file(), e.line(), e.func()) << e.what();
         throw;
       }