X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;h=d0942edf4005e71b306c1d5e67036f0d59cbfd5e;hb=b10a03e4afb5514f1c86f5c75b9bfc7d46ce49b4;hp=ce8db70bd1029be16eb3b1f6e522fc3cb450b850;hpb=e660fe3e93b1068891c1306fd9eaeac27d3c18a9;p=awesomized%2Flibmemcached

diff --git a/tests/server.c b/tests/server.c
index ce8db70b..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)
@@ -36,12 +38,18 @@ void server_startup(server_startup_st *construct)
         int count;
         int status;
 
-        if (construct->udp)
-          sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -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 -t 1 -p %u", x, x+ TEST_PORT_BASE);
+        {
+          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);
-        WATCHPOINT_ASSERT(status == 0);
         count= sprintf(end_ptr, "localhost:%u,", x + TEST_PORT_BASE);
         end_ptr+= count;
       }