Import/Merge of libtest latest.

[m6w6/libmemcached] / libtest / collection.cc

diff --git a/libtest/collection.cc b/libtest/collection.cc
index c6fec1ebd8d57250700aa29a30d6e8dc70f17d90..3f85d0fe9ea0394e2d1bd9ba1b86bfeec17b2311 100644 (file)
--- a/libtest/collection.cc
+++ b/libtest/collection.cc
@@ -97,8 +97,6 @@ test_return_t Collection::exec()
   {
     for (test_st *run= _tests; run->name; run++)
     {
-      long int load_time= 0;
-
       if (_frame->match(run->name))
       {
         continue;
@@ -122,8 +120,7 @@ test_return_t Collection::exec()
       }
       catch (libtest::fatal &e)
       {
-        Error << "Fatal exception was thrown: " << e.what();
-        return_code= TEST_FAILURE;
+        stream::cerr(e.file(), e.line(), e.func()) << e.what();
         _failed++;
         throw;
       }