Improvements on valgrind detection.

[m6w6/libmemcached] / tests / libmemcached-1.0 / setup_and_teardowns.cc

diff --git a/tests/libmemcached-1.0/setup_and_teardowns.cc b/tests/libmemcached-1.0/setup_and_teardowns.cc
index 06a492529eaf98e063e429f4d70848514176736b..093be4906f2b3998c7ce211575dfbbda442939b7 100644 (file)
--- a/tests/libmemcached-1.0/setup_and_teardowns.cc
+++ b/tests/libmemcached-1.0/setup_and_teardowns.cc
@@ -44,6 +44,18 @@
 
 #include <sys/stat.h>
 
+using namespace libtest;
+
+memcached_return_t return_value_based_on_buffering(memcached_st *memc)
+{
+  if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS))
+  {
+    return MEMCACHED_BUFFERED;
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
 /**
   @note This should be testing to see if the server really supports the binary protocol.
 */
@@ -61,6 +73,7 @@ test_return_t pre_unix_socket(memcached_st *memc)
 
   memcached_servers_reset(memc);
   const char *socket_file= libtest::default_socket();
+  test_skip(true, bool(socket_file));
 
   test_skip(0, stat(socket_file, &buf));