projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
memcached_dump: ignore CLIENT_ERROR Illegal slab id
[awesomized/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 596ec8eea60fece04520d19ab8738032e1304106..2608778c9b13c497bccbc517833665c12ec0d842 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-43,28
+43,14
@@
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)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
+ SKIP_UNLESS(libtest::has_libmemcached());
if (servers.sasl())
{
if (servers.sasl())
{
- if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
+ SKIP_UNLESS(libtest::has_libmemcached_sasl());
- if (HAVE_MEMCACHED_SASL_BINARY == 0)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
-
// Assume we are running under valgrind, and bail
// Assume we are running under valgrind, and bail
- if (getenv("
TESTS_ENVIRONMENT
"))
+ if (getenv("
LOG_COMPILER
"))
{
error= TEST_SKIPPED;
return NULL;
{
error= TEST_SKIPPED;
return NULL;
@@
-77,7
+63,7
@@
static void *world_create(libtest::server_startup_st& servers, test_return_t& er
if (servers.sasl())
{
if (servers.sasl())
{
- if (server_startup(servers, "memcached-sasl", port,
0,
NULL) == false)
+ if (server_startup(servers, "memcached-sasl", port, NULL) == false)
{
error= TEST_SKIPPED;
return NULL;
{
error= TEST_SKIPPED;
return NULL;
@@
-85,7
+71,7
@@
static void *world_create(libtest::server_startup_st& servers, test_return_t& er
}
else
{
}
else
{
- if (server_startup(servers, "memcached", port,
0,
NULL) == false)
+ if (server_startup(servers, "memcached", port, NULL) == false)
{
error= TEST_SKIPPED;
return NULL;
{
error= TEST_SKIPPED;
return NULL;
@@
-101,11
+87,13
@@
static void *world_create(libtest::server_startup_st& servers, test_return_t& er
static bool world_destroy(void *object)
{
libmemcached_test_container_st *container= (libmemcached_test_container_st *)object;
static bool world_destroy(void *object)
{
libmemcached_test_container_st *container= (libmemcached_test_container_st *)object;
+#if 0
#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT
if (LIBMEMCACHED_WITH_SASL_SUPPORT)
{
sasl_done();
}
#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT
if (LIBMEMCACHED_WITH_SASL_SUPPORT)
{
sasl_done();
}
+#endif
#endif
delete container;
#endif
delete container;