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

[m6w6/libmemcached] / tests / libmemcached_world.h

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 10cca65f0d3eeeeca5c87a3337129e0660efeb6b..4092d95104773c9930c151e4d4b4c34cb31db952 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -17,6 +17,7 @@ extern "C" {
 typedef struct
 {
   server_startup_st construct;
+  memcached_st *parent;
   memcached_st *memc;
 } libmemcached_test_container_st;
 
@@ -32,6 +33,12 @@ test_return_t world_destroy(libmemcached_test_container_st *);
 
 static libmemcached_test_container_st global_container;
 
+/**
+  @note generic shutdown/startup for libmemcached tests.
+*/
+test_return_t world_container_startup(libmemcached_test_container_st *container);
+test_return_t world_container_shutdown(libmemcached_test_container_st *container);
+
 libmemcached_test_container_st *world_create(test_return_t *error)
 {
   memset(&global_container, 0, sizeof(global_container));
@@ -51,19 +58,34 @@ libmemcached_test_container_st *world_create(test_return_t *error)
   return &global_container;
 }
 
-
-test_return_t world_test_startup(libmemcached_test_container_st *container)
+test_return_t world_container_startup(libmemcached_test_container_st *container)
 {
   memcached_return_t rc;
-  container->memc= memcached_create(NULL);
-  test_truth((container->memc != NULL));
+  container->parent= memcached_create(NULL);
+  test_truth((container->parent != NULL));
 
-  rc= memcached_server_push(container->memc, container->construct.servers);
+  rc= memcached_server_push(container->parent, container->construct.servers);
   test_truth(rc == MEMCACHED_SUCCESS);
 
   return TEST_SUCCESS;
 }
 
+test_return_t world_container_shutdown(libmemcached_test_container_st *container)
+{
+  memcached_free(container->parent);
+  container->parent= NULL;
+
+  return TEST_SUCCESS;
+}
+
+test_return_t world_test_startup(libmemcached_test_container_st *container)
+{
+  container->memc= memcached_clone(NULL, container->parent);
+  test_truth((container->memc != NULL));
+
+  return TEST_SUCCESS;
+}
+
 test_return_t world_flush(libmemcached_test_container_st *container)
 {
   memcached_flush(container->memc, 0);
@@ -97,6 +119,7 @@ test_return_t world_on_error(test_return_t test_state, libmemcached_test_contain
 {
   (void)test_state;
   memcached_free(container->memc);
+  container->memc= NULL;
 
   return TEST_SUCCESS;
 }