32bit fix.

[awesomized/libmemcached] / tests / mem_functions.c

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index 700003f3b43d77ce4ff5d2fd00b6bb8d3bedd392..281f5938b151665997c5f1c3a9c723452a0f9703 100644 (file)
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -258,8 +258,8 @@ static test_return_t clone_test(memcached_st *memc)
       test_true(memc_clone->flags.randomize_replica_read == memc->flags.randomize_replica_read);
     }
     test_true(memc_clone->get_key_failure == memc->get_key_failure);
-    test_true(memc_clone->hash == memc->hash);
-    test_true(memc_clone->distribution_hash == memc->distribution_hash);
+    test_true(hashkit_compare(&memc_clone->hashkit, &memc->hashkit));
+    test_true(hashkit_compare(&memc_clone->distribution_hashkit, &memc->distribution_hashkit));
     test_true(memc_clone->io_bytes_watermark == memc->io_bytes_watermark);
     test_true(memc_clone->io_msg_watermark == memc->io_msg_watermark);
     test_true(memc_clone->io_key_prefetch == memc->io_key_prefetch);
@@ -332,16 +332,21 @@ static test_return_t error_test(memcached_st *memc)
                         4269430871U, 610793021U, 527273862U, 1437122909U,
                         2300930706U, 2943759320U, 674306647U, 2400528935U,
                         54481931U, 4186304426U, 1741088401U, 2979625118U,
-                        4159057246U, 3425930182U, 2593724503U};
+                        4159057246U, 3425930182U, 2593724503U,  1868899624U};
 
   // You have updated the memcache_error messages but not updated docs/tests.
-  test_true(MEMCACHED_MAXIMUM_RETURN == 39);
+  test_true(MEMCACHED_MAXIMUM_RETURN == 40);
   for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++)
   {
     uint32_t hash_val;
     const char *msg=  memcached_strerror(memc, rc);
     hash_val= memcached_generate_hash_value(msg, strlen(msg),
                                             MEMCACHED_HASH_JENKINS);
+    if (values[rc] != hash_val)
+    {
+      fprintf(stderr, "\n\nYou have updated memcached_return_t without updating the error_test\n");
+      fprintf(stderr, "%u, %s, (%u)\n\n", (uint32_t)rc, memcached_strerror(memc, rc), hash_val);
+    }
     test_true(values[rc] == hash_val);
   }
 
@@ -473,7 +478,7 @@ static test_return_t cas2_test(memcached_st *memc)
 
   results= memcached_fetch_result(memc, &results_obj, &rc);
   test_true(results);
-  test_true(results->cas);
+  test_true(results->item_cas);
   test_true(rc == MEMCACHED_SUCCESS);
   test_true(memcached_result_cas(results));
 
@@ -3399,8 +3404,13 @@ static test_return_t pre_cork(memcached_st *memc)
 {
   memcached_return_t rc;
   bool set= true;
+
   rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, set);
 
+#ifdef __APPLE__
+  return TEST_SKIPPED;
+#endif
+
   if (rc == MEMCACHED_SUCCESS)
     return TEST_SUCCESS;
 
@@ -3413,6 +3423,10 @@ static test_return_t pre_cork_and_nonblock(memcached_st *memc)
   
   rc= pre_cork(memc);
 
+#ifdef __APPLE__
+  return TEST_SKIPPED;
+#endif
+
   if (rc != TEST_SUCCESS)
     return rc;
 
@@ -4906,6 +4920,22 @@ static test_return_t hsieh_avaibility_test (memcached_st *memc)
   return TEST_SUCCESS;
 }
 
+static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  const char **ptr;
+
+  for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val;
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_DEFAULT);
+    test_true(one_at_a_time_values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
 static test_return_t md5_run (memcached_st *memc __attribute__((unused)))
 {
   uint32_t x;
@@ -5973,6 +6003,7 @@ test_st ketama_auto_eject_hosts[] ={
 };
 
 test_st hash_tests[] ={
+  {"one_at_a_time_run", 0, (test_callback_fn)one_at_a_time_run },
   {"md5", 0, (test_callback_fn)md5_run },
   {"crc", 0, (test_callback_fn)crc_run },
   {"fnv1_64", 0, (test_callback_fn)fnv1_64_run },