projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Number to define
[m6w6/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 596ec8eea60fece04520d19ab8738032e1304106..6bed25a9624a5458187aa165cdd847e3eeb20083 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-43,26
+43,12
@@
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
if (getenv("TESTS_ENVIRONMENT"))
{
// Assume we are running under valgrind, and bail
if (getenv("TESTS_ENVIRONMENT"))
{
@@
-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;