X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.c;h=7cfb8395d69c66b230c1c2627149255c98e48216;hb=433343633afc75bea091b0fefda6578aa653c665;hp=793bcbd7264d08af68112aefa033e4e931af0980;hpb=c47100252c635d42edd69c3a99dd63b665b01e45;p=awesomized%2Flibmemcached

diff --git a/tests/test.c b/tests/test.c
index 793bcbd7..7cfb8395 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -19,7 +19,6 @@
 #include <unistd.h>
 #include <time.h>
 #include <fnmatch.h>
-#include "server.h"
 
 #include "test.h"
 
@@ -42,7 +41,7 @@ static long int timedif(struct timeval a, struct timeval b)
   return s + us;
 }
 
-static const char *test_strerror(test_return_t code)
+const char *test_strerror(test_return_t code)
 {
   switch (code) {
   case TEST_SUCCESS:
@@ -58,7 +57,6 @@ static const char *test_strerror(test_return_t code)
     fprintf(stderr, "Unknown return value\n");
     abort();
   }
-
 }
 
 void create_core(void)
@@ -172,7 +170,7 @@ int main(int argc, char *argv[])
       }
 
 
-      if (next->pre)
+      if (next->pre && world.runner->pre)
       {
         return_code= world.runner->pre(next->pre, world_ptr);
 
@@ -187,9 +185,9 @@ int main(int argc, char *argv[])
       gettimeofday(&end_time, NULL);
       load_time= timedif(end_time, start_time);
 
-      if (next->post)
+      if (next->post && world.runner->post)
       {
-        (void) world.runner->pre(next->pre, world_ptr);
+        (void) world.runner->post(next->post, world_ptr);
       }
 
       if (world.post_run)