X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;h=29f6699ddd42b06008413bd7ba324519ba487de4;hb=bdb7897b42e740471cc02589eda4434a09bbd330;hp=c8e1d98fa42fa4692d85931c58006bc699ed2d23;hpb=3994a4a1ef81dfcf1e893ddb08e923c65e337ebd;p=m6w6%2Flibmemcached diff --git a/tests/server.c b/tests/server.c index c8e1d98f..29f6699d 100644 --- a/tests/server.c +++ b/tests/server.c @@ -3,12 +3,13 @@ */ #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 + #include #include #include #include #include -#include +#include #include #include "server.h" @@ -25,7 +26,6 @@ void server_startup(server_startup_st *construct) } else { - WATCHPOINT; { char server_string_buffer[8096]; char *end_ptr; @@ -35,12 +35,23 @@ 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); - else - sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -p %u", x, x+ TEST_PORT_BASE); - system(buffer); + if (construct->udp){ + if(x == 0) { + sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -U %u -m 128", x, x+ TEST_PORT_BASE); + } else { + sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -U %u", x, x+ TEST_PORT_BASE); + } + } + else{ + if(x == 0) { + sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -p %u -m 128", x, x+ TEST_PORT_BASE); + } else { + sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -p %u", x, x+ TEST_PORT_BASE); + } + } + status= system(buffer); count= sprintf(end_ptr, "localhost:%u,", x + TEST_PORT_BASE); end_ptr+= count; }