tests: cleanup tests ported so far

[awesomized/libmemcached] / tests / libmemcached-1.0 / sasl.cc

diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc
index 65ce031022bb4aff5e8bb41d80747b32ae02b5e4..041af2055ce12c7357a268c6f88d0f057a9d9430 100644 (file)
--- a/tests/libmemcached-1.0/sasl.cc
+++ b/tests/libmemcached-1.0/sasl.cc
@@ -34,8 +34,8 @@
  *
  */
 
-#include <config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
@@ -43,14 +43,11 @@ using namespace libtest;
   Test cases
 */
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 static test_return_t pre_sasl(memcached_st *)
 {
-  if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
-  {
-    return TEST_SKIPPED;
-  }
+  SKIP_IF(LIBMEMCACHED_WITH_SASL_SUPPORT == 0);
 
   return TEST_SUCCESS;
 }
@@ -63,6 +60,7 @@ static test_return_t pre_sasl(memcached_st *)
  */
 static test_return_t sasl_auth_test(memcached_st *memc)
 {
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
   if (LIBMEMCACHED_WITH_SASL_SUPPORT)
   {
     test_compare(MEMCACHED_SUCCESS, memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0));
@@ -79,6 +77,9 @@ static test_return_t sasl_auth_test(memcached_st *memc)
     memcached_quit(memc);
     return TEST_SUCCESS;
   }
+#else
+  (void)memc;
+#endif
 
   return TEST_SKIPPED;
 }