Update libtest.

[awesomized/libmemcached] / libtest / collection.cc

diff --git a/libtest/collection.cc b/libtest/collection.cc
index 26e8bb44e33d455ef725546dc98fe338da3427b3..3bf571e8358b14ce4c25a2a4c6a5680eec34b295 100644 (file)
--- a/libtest/collection.cc
+++ b/libtest/collection.cc
@@ -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++;