projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove dead pandora files.
[awesomized/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 88329db4a85f595edf4fd083fbedd18ce1f25cc4..e6f782f76227dd4721d2cd8c07745bf2b1f19371 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-43,13
+43,13
@@
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 (
HAVE_MEMCACHED_BINARY == 0
)
+ if (
libtest::has_memcached() == false
)
{
error= TEST_SKIPPED;
return NULL;
}
{
error= TEST_SKIPPED;
return NULL;
}
- if (
servers.sasl() and (LIBMEMCACHED_WITH_SASL_SUPPORT == 0 or MEMCACHED_SASL_BINARY == 0
))
+ if (
(servers.sasl()) and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0) or (MEMCACHED_SASL_BINARY == 0)
))
{
error= TEST_SKIPPED;
return NULL;
{
error= TEST_SKIPPED;
return NULL;
@@
-70,14
+70,22
@@
static void *world_create(libtest::server_startup_st& servers, test_return_t& er
{
if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
{
{
if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
{
+ error= TEST_SKIPPED;
+#if 0
fatal_message("Could not start memcached-sasl");
fatal_message("Could not start memcached-sasl");
+#endif
+ return NULL;
}
}
else
{
if (server_startup(servers, "memcached", port, 0, NULL) == false)
{
}
}
else
{
if (server_startup(servers, "memcached", port, 0, NULL) == false)
{
+ error= TEST_SKIPPED;
+#if 0
fatal_message("Could not start memcached");
fatal_message("Could not start memcached");
+#endif
+ return NULL;
}
}
}
}
}
}