X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.h;h=28388bbd7f0add79e79863005a50c5b11b36cf48;hb=226c5487c7e101b7b3606074b3b795eb547ebaa2;hp=39b141250ad7d76fc10caa9c190caff9a611cd37;hpb=69e37123baed3e7d5970be3c576fb61f91713736;p=m6w6%2Flibmemcached

diff --git a/tests/test.h b/tests/test.h
index 39b14125..28388bbd 100644
--- 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;
@@ -102,11 +105,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 +147,15 @@ void create_core(void);
 */
 const char *test_strerror(test_return_t code);
 
-#define test_truth(A) \
+#define test_fail(A) \
+do \
+{ \
+  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)) { \