X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;h=d0942edf4005e71b306c1d5e67036f0d59cbfd5e;hb=15082495242e0baf2248f255e8dac8eb286e81f2;hp=8f4dc2986401570ca5474143aa5d0168c53685c0;hpb=85d5656889bb4a6148974f8817fbd419a45a3797;p=m6w6%2Flibmemcached diff --git a/tests/server.c b/tests/server.c index 8f4dc298..d0942edf 100644 --- a/tests/server.c +++ b/tests/server.c @@ -3,13 +3,15 @@ */ #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 + #include #include #include #include #include -#include +#include #include +#include "libmemcached/libmemcached_config.h" #include "server.h" void server_startup(server_startup_st *construct) @@ -34,12 +36,20 @@ void server_startup(server_startup_st *construct) { char buffer[1024]; /* Nothing special for number */ int count; + int status; - if (construct->udp) - sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -U %u", x, x+ TEST_PORT_BASE); + if (x == 0) + { + sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128", + MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE); + } else - sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -p %u", x, x+ TEST_PORT_BASE); - system(buffer); + { + sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u", + MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE); + } + fprintf(stderr, "STARTING SERVER: %s\n", buffer); + status= system(buffer); count= sprintf(end_ptr, "localhost:%u,", x + TEST_PORT_BASE); end_ptr+= count; }