32bit fix.

[awesomized/libmemcached] / tests / mem_functions.c

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index 14550dcbf8e7445814779939aaae1a63ed28b114..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);
@@ -3404,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;
 
@@ -3418,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;
 
@@ -4911,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;
@@ -5978,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 },