diff options
author | Brian Aker <brian@tangent.org> | 2011-08-16 17:03:08 -0700 |
---|---|---|
committer | Brian Aker <brian@tangent.org> | 2011-08-16 17:03:08 -0700 |
commit | 58c279d58e2a44562f729e93e301dfedf42f530b (patch) | |
tree | 1fea8b32d80bcb1992222ce236963603bad87328 /tests/libmemcached_world.h | |
parent | 0ae14bed70947882f5ee9423dfcb20eeda7acdd9 (diff) | |
download | libmemcached-58c279d58e2a44562f729e93e301dfedf42f530b.tar.gz |
Merge in updates for sasl.
Diffstat (limited to 'tests/libmemcached_world.h')
-rw-r--r-- | tests/libmemcached_world.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h index 17561838..e2f0c27d 100644 --- 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++) { |