X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemping.cc;h=0712efd2d9c6ee5c41e0ede090a0925fcb444c8a;hb=64cb7f342f590fa8fe3376eb7562ee73e4dc75f2;hp=543efc7ccab0b32b4746c479de89faa361e770a5;hpb=29021cad3872f6c72e663431eb1e68b50ef8b83f;p=awesomized%2Flibmemcached diff --git a/tests/memping.cc b/tests/memping.cc index 543efc7c..0712efd2 100644 --- a/tests/memping.cc +++ b/tests/memping.cc @@ -39,10 +39,10 @@ Test that we are cycling the servers we are creating during testing. */ -#include +#include "mem_config.h" -#include -#include +#include "libtest/test.hpp" +#include "libmemcached-1.0/memcached.h" using namespace libtest; @@ -50,7 +50,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("clients/memping"); +static std::string executable("src/bin/memping"); static test_return_t help_test(void *) { @@ -64,7 +64,7 @@ static test_return_t help_test(void *) static test_return_t ping_TEST(void *) { char buffer[1024]; - snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port())); + snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port())); const char *args[]= { buffer, 0 }; test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true)); @@ -75,7 +75,7 @@ static test_return_t ping_TEST(void *) static test_return_t NOT_FOUND_TEST(void *) { char buffer[1024]; - snprintf(buffer, sizeof(buffer), "--server=nonexist.libmemcached.org:%d", int(default_port())); + snprintf(buffer, sizeof(buffer), "--servers=nonexist.libmemcached.org:%d", int(default_port())); const char *args[]= { buffer, 0 }; test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));