projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
| inline |
side by side
Merge in tests for SASL
[awesomized/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 17561838c05d3967fb217182602e23ac1cfa006f..e2f0c27d2e4b9de3df69d6ce482c8c8b8bfc5d18 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-37,6
+37,14
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
return NULL;
}
+ // Assume we are running under valgrind, and bail
+ if (servers.sasl() and getenv("TESTS_ENVIRONMENT"))
+ {
+ error= TEST_SKIPPED;
+ return NULL;
+ }
+
+
in_port_t max_port;
for (uint32_t x= 0; x < SERVERS_TO_CREATE; x++)
{