X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcollection.cc;h=dda1341ae1a32ddd194f502b95c156a96cce0b67;hb=e5f0a3ee838764e1ac88e6854176619be31da93f;hp=26e8bb44e33d455ef725546dc98fe338da3427b3;hpb=1d20951aaf789a940b05f8dd78c7bf8854db2521;p=awesomized%2Flibmemcached

diff --git a/libtest/collection.cc b/libtest/collection.cc
index 26e8bb44..dda1341a 100644
--- a/libtest/collection.cc
+++ b/libtest/collection.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/common.h>
 
@@ -118,19 +118,21 @@ test_return_t Collection::exec()
           }
         }
 
-        alarm(600);
+        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++;