Test that we are cycling the servers we are creating during testing.
*/
-#include <mem_config.h>
+#include "mem_config.h"
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
using namespace libtest;
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
-static std::string executable("./clients/memdump");
+static std::string executable("./src/bin/memdump");
static test_return_t help_test(void *)
{
{0, 0, 0, 0}
};
-static void *world_create(server_startup_st& servers, test_return_t& error)
+static void *world_create(server_startup_st& servers, test_return_t&)
{
- if (libtest::has_memcached() == false)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
-
- if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
- {
- error= TEST_FAILURE;
- return NULL;
- }
+ SKIP_UNLESS(libtest::has_memcached());
+
+ ASSERT_TRUE(server_startup(servers, "memcached", libtest::default_port(), NULL));
return &servers;
}