memcached_io_reset passed wrong struct

[awesomized/libmemcached] / tests / server.c

diff --git a/tests/server.c b/tests/server.c
index f5e44a9b182b8de8d8b257fd70383077ebccc274..5023188c0dd088e533aa27e5b2ee60b4c8828d68 100644 (file)
--- a/tests/server.c
+++ b/tests/server.c
@@ -11,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)
@@ -37,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;
       }