Import latest bootstrap.sh

[m6w6/libmemcached] / libtest / framework.cc

diff --git a/libtest/framework.cc b/libtest/framework.cc
index b5ad738b2a88be1ff35ed91ab08e2c39d3f36376..92aacfeea30a37f117efabfa514285b1ae9f50bb 100644 (file)
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -34,18 +34,19 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 
 #include <libtest/common.h>
 #include <libtest/collection.h>
 #include <libtest/signal.h>
 
+#include <algorithm>
 #include <fnmatch.h>
 #include <iostream>
 
 namespace libtest {
 
-Framework::Framework(libtest::SignalThread& signal,
+Framework::Framework(libtest::SignalThread& signal_,
                      const std::string& name_,
                      const std::string& only_run_arg,
                      const std::string& wildcard_arg) :
@@ -59,7 +60,7 @@ Framework::Framework(libtest::SignalThread& signal,
   _runner(NULL),
   _socket(false),
   _creators_ptr(NULL),
-  _signal(signal),
+  _signal(signal_),
   _only_run(only_run_arg),
   _wildcard(wildcard_arg),
   _name(name_)
@@ -67,7 +68,7 @@ Framework::Framework(libtest::SignalThread& signal,
   get_world(this);
 }
 
-void Framework::collections(collection_st* collections_)
+void Framework::collections(collection_st collections_[])
 {
   for (collection_st *next= collections_; next and next->name; next++)
   {
@@ -86,12 +87,8 @@ Framework::~Framework()
 
   delete _runner;
 
-  for (std::vector<Collection*>::iterator iter= _collection.begin();
-       iter != _collection.end();
-       ++iter)
-  {
-    delete *iter;
-  }
+  std::for_each(_collection.begin(), _collection.end(), DeleteFromVector());
+  _collection.clear();
 }
 
 bool Framework::match(const char* arg)
@@ -118,8 +115,7 @@ void Framework::exec()
 
     _total++;
 
-    try
-    {
+    try {
       switch ((*iter)->exec())
       {
       case TEST_FAILURE:
@@ -137,15 +133,15 @@ void Framework::exec()
         break;
       }
     }
-    catch (libtest::fatal& e)
+    catch (const libtest::fatal& e)
     {
       _failed++;
-      stream::cerr(e.file(), e.line(), e.func()) << e.mesg();
+      stream::cerr(e.file(), e.line(), e.func()) << e.what();
     }
-    catch (libtest::disconnected& e)
+    catch (const libtest::disconnected& e)
     {
       _failed++;
-      stream::cerr(e.file(), e.line(), e.func()) << "Unhandled disconnection occurred: " << e.mesg();
+      Error << "Unhandled disconnection occurred:" << e.what();
       throw;
     }
     catch (...)