X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;h=f0926695133571f946ccfcad05a1f06dc11a5326;hb=1b18496b3d1399d90cfba1975f23aee9c747445a;hp=2528787c0a04d45e1370923c18d9378b62faa6f1;hpb=a07bb255b72aa59d0f4c4c63bb71695b2e9df537;p=m6w6%2Flibmemcached

diff --git a/tests/server.c b/tests/server.c
index 2528787c..f0926695 100644
--- a/tests/server.c
+++ b/tests/server.c
@@ -4,7 +4,7 @@
 
 #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 
 
-#include "libmemcached/libmemcached_config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,7 +50,7 @@ void server_startup(server_startup_st *construct)
           {
             if (fgets(buffer, sizeof(buffer), fp) != NULL)
             { 
-              pid_t pid = atol(buffer);
+              pid_t pid = (pid_t)atol(buffer);
               if (pid != 0) 
                 kill(pid, SIGTERM);
             }
@@ -84,7 +84,7 @@ void server_startup(server_startup_st *construct)
 
   assert(construct->servers);
 
-  srandom(time(NULL));
+  srandom((unsigned int)time(NULL));
 
   for (x= 0; x < memcached_server_list_count(construct->servers); x++)
   {
@@ -106,7 +106,9 @@ void server_shutdown(server_startup_st *construct)
     {
       char buffer[1024]; /* Nothing special for number */
       sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
-      system(buffer);
+      /* We have to check the return value of this or the compiler will yell */
+      int sys_ret= system(buffer);
+      assert(sys_ret != -1); 
       sprintf(buffer, "/tmp/%umemc.pid", x);
       unlink(buffer);
     }