| libmemcached_world.h | libmemcached_world.h | |||
|---|---|---|---|---|
| skipping to change at line 51 | skipping to change at line 51 | |||
| #include "tests/libmemcached_test_container.h" | #include "tests/libmemcached_test_container.h" | |||
| static void *world_create(libtest::server_startup_st& servers, test_return_ t& error) | static void *world_create(libtest::server_startup_st& servers, test_return_ t& error) | |||
| { | { | |||
| if (libtest::has_memcached() == false) | if (libtest::has_memcached() == false) | |||
| { | { | |||
| error= TEST_SKIPPED; | error= TEST_SKIPPED; | |||
| return NULL; | return NULL; | |||
| } | } | |||
| if ((servers.sasl()) and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0) or (MEMCA CHED_SASL_BINARY == 0))) | if ((servers.sasl()) and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0))) | |||
| { | { | |||
| error= TEST_SKIPPED; | error= TEST_SKIPPED; | |||
| return NULL; | return NULL; | |||
| } | } | |||
| // Assume we are running under valgrind, and bail | // Assume we are running under valgrind, and bail | |||
| if (servers.sasl() and getenv("TESTS_ENVIRONMENT")) | if (servers.sasl() and getenv("TESTS_ENVIRONMENT")) | |||
| { | { | |||
| error= TEST_SKIPPED; | error= TEST_SKIPPED; | |||
| return NULL; | return NULL; | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ | ||||