X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fsasl.cc;h=041af2055ce12c7357a268c6f88d0f057a9d9430;hb=785f671d065aa12941a98fca384248ac5cd6e527;hp=b85d32779cdd4594f5b35cd86c0b86a3f9639eac;hpb=ad5cb8f903869065c72bb18bf98af6909189a5a9;p=m6w6%2Flibmemcached diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc index b85d3277..041af205 100644 --- a/tests/libmemcached-1.0/sasl.cc +++ b/tests/libmemcached-1.0/sasl.cc @@ -34,8 +34,8 @@ * */ -#include -#include +#include "mem_config.h" +#include "libtest/test.hpp" using namespace libtest; @@ -43,14 +43,11 @@ using namespace libtest; Test cases */ -#include +#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; }