X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcollection.cc;h=b3bdbdeee69548e43776e62340292642e4e83e76;hb=4b5f525d64e1a1685b66880822b78d351ea55a82;hp=346a151cb69ac422d49609cb300b3bc7fb975f48;hpb=00a8f6f7d315dc3fce0b0e5a1987c8663488ae1c;p=m6w6%2Flibmemcached

diff --git a/libtest/collection.cc b/libtest/collection.cc
index 346a151c..b3bdbdee 100644
--- 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,19 +118,21 @@ test_return_t Collection::exec()
           }
         }
 
-        alarm(60);
+        set_alarm();
+
         try 
         {
           return_code= runner_code(_frame, run, _timer);
         }
         catch (...)
         {
-          alarm(0);
+          cancel_alarm();
+
           throw;
         }
-        alarm(0);
+        libtest::cancel_alarm();
       }
-      catch (libtest::exception &e)
+      catch (libtest::fatal &e)
       {
         stream::cerr(e.file(), e.line(), e.func()) << e.what();
         _failed++;