Random cleanup, plus server startup script

diff --git a/.hgignore b/.hgignore
index cd363e7a47bb2ab981807bc358cba8c612ba3034..9aa168ed5e7b56fd3b449305196d0ea85caa756c 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -22,6 +22,14 @@ autom4te.cache/*$
 .(gz|cmp|tar|rpm|srpm)$
 support/libmemcached.pc$
 support/libmemcached.spec$
+docs/pod2htmd.tmp
+docs/pod2htmi.tmp
+lib/memcachedplus.loT
+tests/atomsmasher
+tests/startservers
+tests/stopservers
+tests/udptest
+
 
 
 Makefile(.in)?$

diff --git a/src/memslap.c b/src/memslap.c
index 6027fdddbdd45f0887a4db71a05c0338d12a9948..1d3f87915fa3efd515bf05d51d2a1832e9dd504b 100644 (file)
--- a/src/memslap.c
+++ b/src/memslap.c
@@ -96,7 +96,10 @@ int main(int argc, char *argv[])
     if ((temp= getenv("MEMCACHED_SERVERS")))
       opt_servers= strdup(temp);
     else
+    {
+      fprintf(stderr, "No Servers provided\n");
       exit(1);
+    }
   }
 
   servers= memcached_servers_parse(opt_servers);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 04c1c8f85287694b0dbbcd815d341e805a13ec4a..f23fde0b9a054c8f44081e1a3d6ba1b80d4f7e85 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = output.res output2.res\
 LIBS = 
 
 noinst_HEADERS = test.h server.h
-noinst_PROGRAMS = testapp testplus udptest atomsmasher
+noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
 testapp_SOURCES = test.c function.c ../src/generator.c ../src/execute.c server.c
 testapp_LDADD = $(LDADDS)
@@ -30,6 +30,9 @@ udptest_LDADD = $(LDADDS)
 atomsmasher_SOURCES = test.c atomsmasher.c server.c ../src/generator.c ../src/execute.c
 atomsmasher_LDADD = $(LDADDS)
 
+startservers_SOURCES = start.c server.c
+startservers_LDADD = $(LDADDS)
+
 record:
        ./testapp > output.res
 

diff --git a/tests/server.c b/tests/server.c
index c8e1d98fa42fa4692d85931c58006bc699ed2d23..ce8db70bd1029be16eb3b1f6e522fc3cb450b850 100644 (file)
--- a/tests/server.c
+++ b/tests/server.c
@@ -25,7 +25,6 @@ void server_startup(server_startup_st *construct)
   }
   else
   {
-    WATCHPOINT;
     {
       char server_string_buffer[8096];
       char *end_ptr;
@@ -35,12 +34,14 @@ 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);
+          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 -p %u", x, x+ TEST_PORT_BASE);
-        system(buffer);
+          sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -p %u", 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;
       }

diff --git a/tests/start.c b/tests/start.c
new file mode 100644 (file)
index 0000000..aa042f9
--- /dev/null
+++ b/tests/start.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include <string.h>
+#include "server.h"
+
+int main(void)
+{
+  server_startup_st construct;
+
+  memset(&construct, 0, sizeof(server_startup_st));
+
+  construct.count= 4;
+
+  server_startup(&construct);
+
+  return 0;
+}