projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix situation where test case might bomb if not enough memory is available.
[awesomized/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 88329db4a85f595edf4fd083fbedd18ce1f25cc4..5147e1a42a4e0c44acbfc53673b5bcfa8f083d90 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-43,7
+43,7
@@
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;
@@
-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;
}
}
}
}
}
}