From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 3 Jan 2011 22:47:34 +0000 (+0100)
Subject: curlcheck.h: add fail_if() fix code
X-Git-Tag: curl-7_21_4~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83e9fb21aabbec2;p=curl

curlcheck.h: add fail_if() fix code

The UNITTEST_START and UNITTEST_STOP defines needed to do a new brace
level so that test cases can declare variables fine and still remain
fine C89 code.
---

diff --git a/tests/unit/curlcheck.h b/tests/unit/curlcheck.h
index c34f99093..66f0d3ddb 100644
--- a/tests/unit/curlcheck.h
+++ b/tests/unit/curlcheck.h
@@ -9,6 +9,13 @@
 
 #include "test.h"
 
+#define fail_if(expr, msg)                              \
+  if(expr) {                                            \
+    fprintf(stderr, "%s:%d Assertion '%s' met: %s" ,    \
+            __FILE__, __LINE__, #expr, msg);            \
+    unitfail++;                                         \
+  }
+
 #define fail_unless(expr, msg)                          \
   if(!(expr)) {                                         \
     fprintf(stderr, "%s:%d Assertion '%s' failed: %s" , \
@@ -22,9 +29,11 @@ extern int unitfail;
   int test(char *unused)                        \
   {                                             \
   (void)unused;                                 \
-  unit_setup();
+  unit_setup();                                 \
+  {
 
 #define UNITTEST_STOP                           \
+  }                                             \
   unit_stop();                                  \
   return unitfail;                              \
   }