← Back to branch summary

~yeban/libmemcached/todo-host.c

« back to all changes in this revision

Viewing changes to tests/hashkit_functions.c

  • Committer: Brian Aker
  • Date: 2011-02-15 17:26:17 UTC
  • Revision ID: brian@tangent.org-20110215172617-gr7j6dibksxdupwj
https://launchpad.net/bugs/677609
Merge in bug fix for 677609

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/hashkit_functions.c
251
251
static test_return_t murmur_run (hashkit_st *hashk __attribute__((unused)))
252
252
{
253
253
#ifdef WORDS_BIGENDIAN
 
254
  (void)murmur_values;
254
255
  return TEST_SKIPPED;
255
256
#else
256
257
  uint32_t x;
260
261
  {
261
262
    uint32_t hash_val;
262
263
 
 
264
#ifdef HAVE_MURMUR_HASH
263
265
    hash_val= libhashkit_murmur(*ptr, strlen(*ptr));
 
266
#else
 
267
    hash_val= 1;
 
268
#endif
264
269
    assert(murmur_values[x] == hash_val);
265
270
  }
266
271
 
319
324
    rc= hashkit_set_function(hashk, algo);
320
325
 
321
326
    /* Hsieh is disabled most of the time for patent issues */
 
327
#ifndef HAVE_HSIEH_HASH
322
328
    if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_HSIEH)
323
329
      continue;
 
330
#endif
 
331
 
 
332
#ifndef HAVE_MURMUR_HASH
 
333
    if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_MURMUR)
 
334
      continue;
 
335
#endif
324
336
 
325
337
    if (rc == HASHKIT_FAILURE && algo == HASHKIT_HASH_CUSTOM)
326
338
      continue;