X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmem_udp.cc;h=8610f2587ad798f5aafd19c1dde3c06e18e0ca57;hb=a93908cc9c40eef179d33a89fc011e2e3c54c438;hp=2267fac0d5cdc9ad50771ebf266ed151fe97506f;hpb=d9db3f534bc38ea22e83e5529ff93aea4150ab19;p=awesomized%2Flibmemcached diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc index 2267fac0..8610f258 100644 --- a/tests/mem_udp.cc +++ b/tests/mem_udp.cc @@ -40,16 +40,16 @@ Sample test application. */ -#include -#include +#include "mem_config.h" +#include "libtest/test.hpp" using namespace libtest; -#include -#include -#include -#include -#include +#include "libmemcached-1.0/memcached.h" +#include "libmemcached/server_instance.h" +#include "libmemcached/io.h" +#include "libmemcached/udp.hpp" +#include "libmemcachedutil-1.0/util.h" #include #include @@ -61,7 +61,7 @@ using namespace libtest; #include #include -#include +#include "libtest/server.h" #include "libmemcached/instance.hpp" @@ -145,7 +145,7 @@ static test_return_t init_udp(memcached_st *memc) static test_return_t init_udp_valgrind(memcached_st *memc) { - if (getenv("TESTS_ENVIRONMENT")) + if (getenv("LOG_COMPILER")) { return TEST_SKIPPED; } @@ -157,7 +157,7 @@ static test_return_t init_udp_valgrind(memcached_st *memc) static test_return_t binary_init_udp(memcached_st *memc) { - if (getenv("TESTS_ENVIRONMENT")) + if (getenv("LOG_COMPILER")) { return TEST_SKIPPED; } @@ -269,7 +269,7 @@ static test_return_t set_udp_behavior_test(memcached_st *memc) static test_return_t udp_set_test(memcached_st *memc) { // Assume we are running under valgrind, and bail - if (getenv("TESTS_ENVIRONMENT")) + if (getenv("LOG_COMPILER")) { return TEST_SUCCESS; } @@ -382,7 +382,7 @@ static test_return_t udp_verbosity_test(memcached_st *memc) increment_request_id(&expected_ids[x]); } - test_compare(MEMCACHED_SUCCESS, memcached_verbosity(memc, 3)); + test_compare(MEMCACHED_SUCCESS, memcached_verbosity(memc, 0)); return post_udp_op_check(memc, expected_ids); }