X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.h;h=b002cd1e05a4d896d7cd9b27e9ce3981214793da;hb=b4de8d3fd063b9017797dd9809ab3acb8a537606;hp=e786e9eae35fb321e8415d3977107d1226ef2297;hpb=604540c15315c6ed876082529f639697ba3eceab;p=m6w6%2Flibmemcached

diff --git a/tests/test.h b/tests/test.h
index e786e9ea..b002cd1e 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -28,8 +28,8 @@ struct test_st {
 
 struct collection_st {
   const char *name;
-  memcached_return (*pre)(memcached_st *memc);
-  memcached_return (*post)(memcached_st *memc);
+  memcached_return_t (*pre)(memcached_st *memc);
+  memcached_return_t (*post)(memcached_st *memc);
   test_st *tests;
 };
 
@@ -42,9 +42,38 @@ struct world_st {
 /* How we make all of this work :) */
 void get_world(world_st *world);
 
-#define test_truth(A) if (! (A)) {fprintf(stderr, "%d", __LINE__); return TEST_FAILURE;}
-#define test_false(A) if ((A)) {fprintf(stderr, "%d", __LINE__); return TEST_FAILURE;}
-#define test_strcmp(A,B) if (strcmp((A), (B))) {fprintf(stderr, "%d", __LINE__); return TEST_FAILURE;}
+void create_core(void);
+
+#define test_truth(A) \
+do \
+{ \
+  if (! (A)) { \
+    fprintf(stderr, "Assertion failed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
+    create_core(); \
+    return TEST_FAILURE; \
+  } \
+} while (0)
+
+#define test_false(A) \
+do \
+{ \
+  if ((A)) { \
+    fprintf(stderr, "Assertion failed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
+    create_core(); \
+    return TEST_FAILURE; \
+  } \
+} while (0)
+
+#define test_strcmp(A,B) \
+do \
+{ \
+  if (strcmp((A), (B))) \
+  { \
+    fprintf(stderr, "%d", __LINE__); \
+    create_core(); \
+    return TEST_FAILURE; \
+  } \
+} while (0)
 
 #ifdef	__cplusplus
 }