X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=a536093e7df7900408a0c06fae1e580454a7b39b;hb=785f671d065aa12941a98fca384248ac5cd6e527;hp=6bed25a9624a5458187aa165cdd847e3eeb20083;hpb=08c302d13c70ea37ecba7a4a1c3862c1c0d3b284;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 6bed25a9..a536093e 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -41,6 +41,9 @@
 
 #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)
 {
   SKIP_UNLESS(libtest::has_libmemcached());
@@ -50,11 +53,15 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     SKIP_UNLESS(libtest::has_libmemcached_sasl());
 
     // Assume we are running under valgrind, and bail
-    if (getenv("TESTS_ENVIRONMENT"))
+    if (getenv("LOG_COMPILER"))
     {
       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++)
@@ -87,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;
+#if 0
 #if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT
   if (LIBMEMCACHED_WITH_SASL_SUPPORT)
   {
     sasl_done();
   }
+#endif
 #endif
 
   delete container;