X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fgenerate.cc;h=ada9d2c2b25a79d5c3c2614c7c9a6cbf7d90e582;hb=53418c8467e0e0845e8f9875fccf05a6cc5a4684;hp=a3613ca490f2d83332665918688e800add41419b;hpb=999006a8904a0f08293f1df7bda81bff914b091a;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/generate.cc b/tests/libmemcached-1.0/generate.cc
index a3613ca4..ada9d2c2 100644
--- a/tests/libmemcached-1.0/generate.cc
+++ b/tests/libmemcached-1.0/generate.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcachedutil-1.0/util.h>
@@ -92,7 +92,7 @@ test_return_t generate_large_pairs(memcached_st *memc)
   }
 
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true);
-  unsigned int check_execute= execute_set(memc, global_pairs, global_count);
+  unsigned int check_execute= execute_set(memc, global_pairs, (unsigned int)global_count);
 
   test_true(check_execute > (global_count / 2));
 
@@ -103,10 +103,12 @@ test_return_t generate_data(memcached_st *memc)
 {
   test_compare(TEST_SUCCESS, generate_pairs(memc));
 
-  unsigned int check_execute= execute_set(memc, global_pairs, global_count);
+  unsigned int check_execute= execute_set(memc, global_pairs, (unsigned int)global_count);
 
-  test_true_hint(check_execute > (global_count / 2),
-                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
+  /* Possible false, positive, memcached may have ejected key/value based on
+   * memory needs. */
+
+  test_true(check_execute > (global_count / 2));
 
   return TEST_SUCCESS;
 }
@@ -115,7 +117,7 @@ test_return_t generate_data_with_stats(memcached_st *memc)
 {
   test_compare(TEST_SUCCESS, generate_pairs(memc));
 
-  unsigned int check_execute= execute_set(memc, global_pairs, global_count);
+  unsigned int check_execute= execute_set(memc, global_pairs, (unsigned int)global_count);
 
   test_compare(check_execute, global_count);
 
@@ -129,7 +131,7 @@ test_return_t generate_data_with_stats(memcached_st *memc)
     /* This test was changes so that "make test" would work properlly */
     if (DEBUG)
     {
-      memcached_server_instance_st instance=
+      const memcached_instance_st * instance=
         memcached_server_instance_by_position(memc, host_index);
 
       printf("\nserver %u|%s|%u bytes: %llu\n",
@@ -208,8 +210,10 @@ test_return_t get_read(memcached_st *memc)
       free(return_value);
     }
   }
-  test_true_hint(keys_returned > (global_count / 2),
-                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
+  /*
+    Possible false, positive, memcached may have ejected key/value based on memory needs.
+  */
+  test_true(keys_returned > (global_count / 2));
 
   return TEST_SUCCESS;
 }
@@ -334,8 +338,10 @@ test_return_t delete_generate(memcached_st *memc)
       total++;
     }
   }
-  test_true_hint(total > (global_count / 2),
-                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
+  /*
+    Possible false, positive, memcached may have ejected key/value based on memory needs.
+  */
+  test_true(total > (global_count / 2));
 
   return TEST_SUCCESS;
 }
@@ -353,8 +359,10 @@ test_return_t delete_buffer_generate(memcached_st *memc)
     }
   }
 
-  test_true_hint(total > (global_count / 2),
-                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
+  /*
+     Possible false, positive, memcached may have ejected key/value based on memory needs.
+  */
+  test_true(total > (global_count / 2));
 
   return TEST_SUCCESS;
 }