X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;h=d0942edf4005e71b306c1d5e67036f0d59cbfd5e;hb=15082495242e0baf2248f255e8dac8eb286e81f2;hp=c8e1d98fa42fa4692d85931c58006bc699ed2d23;hpb=540b884236fe1e2d5e6cd52c70881d74e0fcea63;p=m6w6%2Flibmemcached

diff --git a/tests/server.c b/tests/server.c
index c8e1d98f..d0942edf 100644
--- a/tests/server.c
+++ b/tests/server.c
@@ -3,13 +3,15 @@
 */
 
 #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <assert.h>
-#include <memcached.h>
+#include <libmemcached/memcached.h>
 #include <unistd.h>
+#include "libmemcached/libmemcached_config.h"
 #include "server.h"
 
 void server_startup(server_startup_st *construct)
@@ -25,7 +27,6 @@ void server_startup(server_startup_st *construct)
   }
   else
   {
-    WATCHPOINT;
     {
       char server_string_buffer[8096];
       char *end_ptr;
@@ -35,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;
       }