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

diff --git a/tests/server.c b/tests/server.c
index 29f6699d..d0942edf 100644
--- 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,20 +38,17 @@ void server_startup(server_startup_st *construct)
         int count;
         int status;
 
-        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);
-          }
+        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, "%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;