Added libmemcached_ping() to memcached utility library.

[awesomized/libmemcached] / tests / test.h

diff --git a/tests/test.h b/tests/test.h
index 39b141250ad7d76fc10caa9c190caff9a611cd37..77aa5303bbe2bd580e7c1c1d8670463c8e565d00 100644 (file)
--- a/tests/test.h
+++ b/tests/test.h
@@ -16,9 +16,12 @@ extern "C" {
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <stdint.h>
 
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
+
 typedef struct world_st world_st;
 typedef struct collection_st collection_st;
 typedef struct test_st test_st;
@@ -36,6 +39,8 @@ typedef test_return_t (*test_callback_fn)(void *);
 typedef test_return_t (*test_callback_runner_fn)(test_callback_fn, void *);
 typedef test_return_t (*test_callback_error_fn)(test_return_t, void *);
 
+/* Help function for use with gettimeofday() */
+long int timedif(struct timeval a, struct timeval b);
 
 /**
   A structure describing the test case.
@@ -102,11 +107,13 @@ struct world_st {
     test_callback_error_fn on_error;
   } test;
 
-  /* This is called a the beginning of any collection run. */
-  test_callback_fn collection_startup;
+  struct {
+    /* This is called a the beginning of any collection run. */
+    test_callback_fn startup;
 
-  /* This is called a the beginning of any collection run. */
-  test_callback_fn collection_shutdown;
+    /* This is called at the end of any collection run. */
+    test_callback_fn shutdown;
+  } collection;
 
 
   /**
@@ -142,7 +149,17 @@ void create_core(void);
 */
 const char *test_strerror(test_return_t code);
 
-#define test_truth(A) \
+#define test_fail(A) \
+do \
+{ \
+  if (1) { \
+    fprintf(stderr, "\nFailed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
+    create_core(); \
+    return TEST_FAILURE; \
+  } \
+} while (0)
+
+#define test_true(A) \
 do \
 { \
   if (! (A)) { \