Merge in version/etc libtest

[awesomized/libmemcached] / libtest / comparison.hpp

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index 8656e49935447ba2a5e20d120a1ebe6a5eb286fe..6f7c5a5b4b9e3e29f2d2b05576ffd9ea12a0bb6c 100644 (file)
--- a/libtest/comparison.hpp
+++ b/libtest/comparison.hpp
@@ -23,7 +23,14 @@
 
 #include <typeinfo>
 #include <libtest/strerror.h>
+
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
 #include <libmemcached/memcached.h>
+#endif
+
+#if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
+#include <libgearman/gearman.h>
+#endif
 
 namespace libtest {
 
@@ -44,20 +51,31 @@ bool _compare(const char *file, int line, const char *func, T_comparable __expec
 {
   if (__expected != __actual)
   {
-    if (typeid(__expected) == typeid(memcached_return_t))
+    if (typeid(__expected) == typeid(test_return_t))
+    {
+      libtest::stream::make_cerr(file, line, func) << "Expected \"" 
+        << test_strerror(test_return_t(__expected)) 
+        << "\" got \"" 
+        << test_strerror(test_return_t(__actual)) << "\"";
+    }
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
+    else if (typeid(__expected) == typeid(memcached_return_t))
     {
       libtest::stream::make_cerr(file, line, func) << "Expected \"" 
         << memcached_strerror(NULL, memcached_return_t(__expected)) 
         << "\" got \"" 
         << memcached_strerror(NULL, memcached_return_t(__actual)) << "\"";
     }
-    else if (typeid(__expected) == typeid(test_return_t))
+#endif
+#if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
+    else if (typeid(__expected) == typeid(gearman_return_t))
     {
       libtest::stream::make_cerr(file, line, func) << "Expected \"" 
-        << test_strerror(test_return_t(__expected)) 
+        << gearman_strerror(gearman_return_t(__expected)) 
         << "\" got \"" 
-        << test_strerror(test_return_t(__actual)) << "\"";
+        << gearman_strerror(gearman_return_t(__actual)) << "\"";
     }
+#endif
     else
     {
       libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\"";