Protected stdbool.h from being included by C++, which is invalid on Sun Studio.

[m6w6/libmemcached] / tests / test.c

diff --git a/tests/test.c b/tests/test.c
index ff6bca680966e1125041e57a6efa737ba415a1b8..903ad4ee9e87610741a56bb9f1590fc16969405d 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -105,6 +105,34 @@ static world_runner_st defualt_runners= {
   _runner_default
 };
 
+static test_return_t _default_callback(void *p)
+{
+  (void)p;
+
+  return TEST_SUCCESS;
+}
+
+static inline void set_default_fn(test_callback_fn *fn)
+{
+  if (*fn == NULL)
+  {
+    *fn= _default_callback;
+  }
+}
+
+static collection_st *init_world(world_st *world)
+{
+  if (! world->runner)
+  {
+    world->runner= &defualt_runners;
+  }
+
+  set_default_fn(&world->collection.startup);
+  set_default_fn(&world->collection.shutdown);
+
+  return world->collections;
+}
+
 
 int main(int argc, char *argv[])
 {
@@ -123,12 +151,7 @@ int main(int argc, char *argv[])
   memset(&world, 0, sizeof(world));
   get_world(&world);
 
-  if (! world.runner)
-  {
-    world.runner= &defualt_runners;
-  }
-
-  collection= world.collections;
+  collection= init_world(&world);
 
   if (world.create)
   {
@@ -161,10 +184,7 @@ int main(int argc, char *argv[])
 
     stats.collection_total++;
 
-    if (world.collection_startup)
-    {
-      collection_rc= world.test_startup(world_ptr);
-    }
+    collection_rc= world.collection.startup(world_ptr);
 
     switch (collection_rc)
     {
@@ -196,45 +216,48 @@ int main(int argc, char *argv[])
 
       fprintf(stderr, "Testing %s", run->name);
 
-      if (world.test_startup)
+      if (world.test.startup)
       {
-        world.test_startup(world_ptr);
+        world.test.startup(world_ptr);
       }
 
-      if (run->requires_flush && world.flush)
+      if (run->requires_flush && world.test.flush)
       {
-        world.flush(world_ptr);
+        world.test.flush(world_ptr);
       }
 
-      if (world.pre_run)
+      if (world.test.pre_run)
       {
-        world.pre_run(world_ptr);
+        world.test.pre_run(world_ptr);
       }
 
 
-      if (next->pre && world.runner->pre)
+      // Runner code
       {
-        return_code= world.runner->pre(next->pre, world_ptr);
-
-        if (return_code != TEST_SUCCESS)
+        if (next->pre && world.runner->pre)
         {
-          goto error;
+          return_code= world.runner->pre(next->pre, world_ptr);
+
+          if (return_code != TEST_SUCCESS)
+          {
+            goto error;
+          }
         }
-      }
 
-      gettimeofday(&start_time, NULL);
-      return_code= world.runner->run(run->test_fn, world_ptr);
-      gettimeofday(&end_time, NULL);
-      load_time= timedif(end_time, start_time);
+        gettimeofday(&start_time, NULL);
+        return_code= world.runner->run(run->test_fn, world_ptr);
+        gettimeofday(&end_time, NULL);
+        load_time= timedif(end_time, start_time);
 
-      if (next->post && world.runner->post)
-      {
-        (void) world.runner->post(next->post, world_ptr);
+        if (next->post && world.runner->post)
+        {
+          (void) world.runner->post(next->post, world_ptr);
+        }
       }
 
-      if (world.post_run)
+      if (world.test.post_run)
       {
-        world.post_run(world_ptr);
+        world.test.post_run(world_ptr);
       }
 
 error:
@@ -267,10 +290,10 @@ error:
 
       fprintf(stderr, "[ %s ]\n", test_strerror(return_code));
 
-      if (world.on_error)
+      if (world.test.on_error)
       {
         test_return_t rc;
-        rc= world.on_error(return_code, world_ptr);
+        rc= world.test.on_error(return_code, world_ptr);
 
         if (rc != TEST_SUCCESS)
           break;
@@ -292,10 +315,7 @@ error:
       stats.collection_success++;
     }
 
-    if (world.collection_shutdown)
-    {
-      world.collection_shutdown(world_ptr);
-    }
+    world.collection.shutdown(world_ptr);
   }
 
   if (stats.collection_failed || stats.collection_skipped)