Merge lp:~trond-norbye/libmemcached/broken-test-macro into lp:~tangent-org/libmemcached/trunk

[Trond Norbye]

[Trond Norbye (trond-norbye)]

Fix the test-macros so that they can be used in conditional expressions... In addition let's create a coredump so that we can actually find the problem later on... Coredumps should be created by default (if you don't want them disable them with ulimit -c or by setting the env variable). It is much easier to remove a bogus corefile than to reproduce a sporadic failure you didn't get a core file from...

Cheers,

Trond

=== modified file 'tests/test.c'
--- tests/test.c	2009-11-25 08:21:57 +0000
+++ tests/test.c	2009-12-03 15:30:26 +0000
@@ -44,6 +44,14 @@
 
 }
 
+void create_core(void)
+{
+   if (getenv("LIBMEMCACHED_NO_COREDUMP") == NULL && fork() == 0)
+     abort();
+
+   abort();
+}
+
 int main(int argc, char *argv[])
 {
   test_return_t failed;

=== modified file 'tests/test.h'
--- tests/test.h	2009-11-25 08:21:57 +0000
+++ tests/test.h	2009-12-03 15:30:26 +0000
@@ -42,9 +42,38 @@
 /* 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
 }