← Back to branch summary

~brianaker/libmemcached/1224951

« back to all changes in this revision

Viewing changes to tests/libmemcached_world.h

  • Committer: Continuous Integration
  • Date: 2013-04-21 08:24:32 UTC
  • mfrom: (1159.1.2 libmemcached-1.0)
  • Revision ID: ci@tangent.org-20130421082432-wwbwmw70arcf4yxm
Merge lp:~brianaker/libmemcached/exception-cleanup/ Build: jenkins-Libmemcached-272

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/libmemcached_world.h
43
43
 
44
44
static void *world_create(libtest::server_startup_st& servers, test_return_t& error)
45
45
{
46
 
  if (libtest::has_memcached() == false)
47
 
  {
48
 
    error= TEST_SKIPPED;
49
 
    return NULL;
50
 
  }
 
46
  SKIP_UNLESS(libtest::has_libmemcached());
51
47
 
52
48
  if (servers.sasl())
53
49
  {
54
 
    if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
55
 
    {
56
 
      error= TEST_SKIPPED;
57
 
      return NULL;
58
 
    }
 
50
    SKIP_UNLESS(libtest::has_libmemcached_sasl());
59
51
 
60
 
    if (HAVE_MEMCACHED_SASL_BINARY == 0)
61
 
    {
62
 
      error= TEST_SKIPPED;
63
 
      return NULL;
64
 
    }
65
 
    
66
52
    // Assume we are running under valgrind, and bail
67
53
    if (getenv("TESTS_ENVIRONMENT"))
68
54
    {