cmake: IMPORT, EXPORT and RPATH improvements

[m6w6/libmemcached] / tests / hashkit_functions.cc

diff --git a/tests/hashkit_functions.cc b/tests/hashkit_functions.cc
index 9def30259865b83aa80a4c65815e7ffab9601c51..5d070afb6b0b2442e102771e6d8ab2a3f57197c0 100644 (file)
--- a/tests/hashkit_functions.cc
+++ b/tests/hashkit_functions.cc
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
@@ -44,8 +44,8 @@ using namespace libtest;
 #include <cstdlib>
 #include <cstring>
 
-#include <libhashkit-1.0/hashkit.h>
-#include <libhashkit/is.h>
+#include "libhashkit-1.0/hashkit.h"
+#include "libhashkit/is.h"
 
 #include "tests/hash_results.h"
 
@@ -347,7 +347,12 @@ static test_return_t hashkit_set_function_test(hashkit_st *hashk)
     const char **ptr;
     uint32_t *list;
 
-    test_skip(true, libhashkit_has_algorithm(static_cast<hashkit_hash_algorithm_t>(algo)));
+    if (HASHKIT_HASH_CUSTOM == algo) {
+      continue;
+    }
+    if (!libhashkit_has_algorithm(static_cast<hashkit_hash_algorithm_t>(algo))) {
+      continue;
+    }
 
     hashkit_return_t rc= hashkit_set_function(hashk, static_cast<hashkit_hash_algorithm_t>(algo));
 
@@ -391,6 +396,10 @@ static test_return_t hashkit_set_function_test(hashkit_st *hashk)
       list= murmur_values;
       break;
 
+    case HASHKIT_HASH_MURMUR3:
+      list= murmur3_values;
+      break;
+
     case HASHKIT_HASH_JENKINS:
       list= jenkins_values;
       break;
@@ -413,7 +422,7 @@ static test_return_t hashkit_set_function_test(hashkit_st *hashk)
     }
     else
     {
-      return TEST_FAILURE;
+      test_fail("Unknown algorithm");
     }
   }
 
@@ -473,7 +482,7 @@ static test_return_t hashkit_get_function_test(hashkit_st *hashk)
   for (int algo= int(HASHKIT_HASH_DEFAULT); algo < int(HASHKIT_HASH_MAX); algo++)
   {
 
-    if (HASHKIT_HASH_CUSTOM)
+    if (HASHKIT_HASH_CUSTOM == algo)
     {
       continue;
     }