Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-183

[awesomized/libmemcached] / libtest / collection.cc

diff --git a/libtest/collection.cc b/libtest/collection.cc
index 717847eb8d6537937576a52eabb4a91a24ed1290..b3bdbdeee69548e43776e62340292642e4e83e76 100644 (file)
--- a/libtest/collection.cc
+++ b/libtest/collection.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 
 #include <libtest/common.h>
 
@@ -85,7 +85,7 @@ Collection::Collection(Framework* frame_arg,
   _skipped(0),
   _failed(0),
   _total(0),
-  _formatter(_name)
+  _formatter(frame_arg->name(), _name)
 {
   fatal_assert(arg);
 }
@@ -118,7 +118,19 @@ test_return_t Collection::exec()
           }
         }
 
-        return_code= runner_code(_frame, run, _timer);
+        set_alarm();
+
+        try 
+        {
+          return_code= runner_code(_frame, run, _timer);
+        }
+        catch (...)
+        {
+          cancel_alarm();
+
+          throw;
+        }
+        libtest::cancel_alarm();
       }
       catch (libtest::fatal &e)
       {