Merge branch 'collectd-5.7'

[collectd.git] / src / testing.h

diff --git a/src/testing.h b/src/testing.h
index 49124da..96b6ba9 100644 (file)
--- a/src/testing.h
+++ b/src/testing.h
@@ -51,10 +51,13 @@ static int check_count__ = 0;
 
 #define END_TEST exit((fail_count__ == 0) ? 0 : 1);
 
+#define LOG(result, text)                                                      \
+  printf("%s %i - %s\n", result ? "ok" : "not ok", ++check_count__, text)
+
 #define OK1(cond, text)                                                        \
   do {                                                                         \
     _Bool result = (cond);                                                     \
-    printf("%s %i - %s\n", result ? "ok" : "not ok", ++check_count__, text);   \
+    LOG(result, text);                                                         \
     if (!result) {                                                             \
       return -1;                                                               \
     }                                                                          \
@@ -101,7 +104,8 @@ static int check_count__ = 0;
   do {                                                                         \
     double want__ = (double)expect;                                            \
     double got__ = (double)actual;                                             \
-    if (isnan(want__) && !isnan(got__)) {                                      \
+    if ((isnan(want__) && !isnan(got__)) ||                                    \
+        (!isnan(want__) && isnan(got__))) {                                    \
       printf("not ok %i - %s = %.15g, want %.15g\n", ++check_count__, #actual, \
              got__, want__);                                                   \
       return (-1);                                                             \