Update for ifdef for clang. Also fix a bad operation comparison.

[awesomized/libmemcached] / libtest / collection.cc

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