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

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