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

diff --git a/libtest/collection.cc b/libtest/collection.cc
index 717847eb..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,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)
       {