Import/Merge of libtest latest.

[m6w6/libmemcached] / libtest / main.cc

diff --git a/libtest/main.cc b/libtest/main.cc
index 6597f84b8ee68cf3ba653fcaa06f59f7ca879054..5fa538899b820a92b88ecc0fc374a92a4896ae4c 100644 (file)
--- a/libtest/main.cc
+++ b/libtest/main.cc
@@ -88,6 +88,17 @@ int main(int argc, char *argv[])
   std::string collection_to_run;
   std::string wildcard;
 
+  /*
+    Valgrind does not currently work reliably, or sometimes at all, on OSX
+    - Fri Jun 15 11:24:07 EDT 2012
+  */
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+  if (valgrind_is_caller())
+  {
+    return EXIT_SKIP;
+  }
+#endif
+
   // Options parsing
   {
     enum long_option_t {
@@ -253,6 +264,7 @@ int main(int argc, char *argv[])
           return EXIT_SKIP;
 
         case TEST_FAILURE:
+          std::cerr << "frame->create()" << std::endl;
           return EXIT_FAILURE;
         }
       }
@@ -291,7 +303,7 @@ int main(int argc, char *argv[])
   }
   catch (libtest::fatal& e)
   {
-    std::cerr << e.what() << std::endl;
+    std::cerr << "FATAL:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (libtest::disconnected& e)
@@ -301,7 +313,7 @@ int main(int argc, char *argv[])
   }
   catch (std::exception& e)
   {
-    std::cerr << e.what() << std::endl;
+    std::cerr << "std::exception:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (...)