X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fplus.cpp;h=1077ae72fd1a80b8ba98d803d400dfbb5d8dbf5e;hb=6b7d2bf0319e0bd48bd6aa4ad8c56a935f98b0d2;hp=e7bfd836892f35139bc6e43fce21deacdb8cfba3;hpb=f47caf2833675cce0b62a6e4ffd6764c1490a8b4;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp
index e7bfd836..1077ae72 100644
--- a/tests/libmemcached-1.0/plus.cpp
+++ b/tests/libmemcached-1.0/plus.cpp
@@ -35,13 +35,13 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 /*
   C++ interface test
 */
-#include <libmemcached-1.0/memcached.hpp>
-#include <libtest/test.hpp>
+#include "libmemcached-1.0/memcached.hpp"
+#include "libtest/test.hpp"
 
 #include <cstdio>
 #include <cstdlib>
@@ -49,7 +49,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#if HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 #include <ctime>
 
 #include <string>
@@ -181,6 +183,13 @@ static test_return_t mget_test(memcached_st *original)
   vector<char> return_value;
 
   /* We need to empty the server before we continue the test */
+  bool flush_res= memc.flush();
+  if (flush_res == false)
+  {
+    std::string error_string;
+    ASSERT_TRUE(memc.error(error_string));
+    Error << error_string;
+  }
   test_true(memc.flush());
 
   test_true(memc.mget(keys));
@@ -218,7 +227,7 @@ static test_return_t lp_1010899_with_args_TEST(memcached_st *original)
 {
   // Check to see everything is setup internally even when a host is specified
   // on creation.
-  memcached_server_instance_st instance= memcached_server_instance_by_position(original, 0);
+  const memcached_instance_st* instance= memcached_server_instance_by_position(original, 0);
   Memcache memc(memcached_server_name(instance), memcached_server_port(instance));
 
   test_false(memc.increment(__func__, 0, NULL));