projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
docs: ws
[m6w6/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 3dda2d8ada2a8c78624ed0b1a5601fc90c7ecbfb..a536093e7df7900408a0c06fae1e580454a7b39b 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-41,34
+41,27
@@
#include "tests/libmemcached_test_container.h"
#include "tests/libmemcached_test_container.h"
+static char *sasl_pwdb = const_cast<char *>(LIBMEMCACHED_WITH_SASL_PWDB);
+static char *sasl_conf = const_cast<char *>(LIBMEMCACHED_WITH_SASL_CONF);
+
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;
}
+
+ // provide conf and pwdb to memcached binary
+ putenv(sasl_pwdb);
+ putenv(sasl_conf);
}
for (uint32_t x= 0; x < servers.servers_to_run(); x++)
}
for (uint32_t x= 0; x < servers.servers_to_run(); x++)
@@
-101,11
+94,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;