X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;h=5023188c0dd088e533aa27e5b2ee60b4c8828d68;hb=783dfde5cc1545c80b7fa25d4ec2da98826333f8;hp=58f45233cbe0f137c192c0ac23c107bfade6bed4;hpb=34a8c3858f30b02568c87f56a827f618aba6d6be;p=awesomized%2Flibmemcached

diff --git a/tests/server.c b/tests/server.c
index 58f45233..5023188c 100644
--- a/tests/server.c
+++ b/tests/server.c
@@ -3,6 +3,7 @@
 */
 
 #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -10,6 +11,7 @@
 #include <assert.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,25 @@ 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);
-        else
-          sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -p %u", x, x+ TEST_PORT_BASE);
+        if (construct->udp){
+          if(x == 0) {
+            sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -U %u -m 128", 
+                    MEMCACHED_BINARY, x, x+ TEST_PORT_BASE);
+          } else {
+            sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -U %u", 
+                    MEMCACHED_BINARY, x, x+ TEST_PORT_BASE);
+          }
+        }
+        else{
+          if(x == 0) {
+            sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -m 128", 
+                    MEMCACHED_BINARY, x, x+ TEST_PORT_BASE);
+          } else {
+            sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u", 
+                    MEMCACHED_BINARY, x, x+ TEST_PORT_BASE);
+          }
+        }
         status= system(buffer);
-        WATCHPOINT_ASSERT(status == 0);
         count= sprintf(end_ptr, "localhost:%u,", x + TEST_PORT_BASE);
         end_ptr+= count;
       }