X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Flite.h;h=52e96380ca60ac873f53e63287ab4058b8db8432;hb=17690735658d7b44f91579df91e31da9ae185158;hp=aad47cf3eb4936982fefdfcc462f84a079c130ca;hpb=381d409b224ca3b4510e770a98bc960084cdf2c4;p=awesomized%2Flibmemcached

diff --git a/libtest/lite.h b/libtest/lite.h
index aad47cf3..52e96380 100644
--- a/libtest/lite.h
+++ b/libtest/lite.h
@@ -37,19 +37,25 @@
 #pragma once
 
 #ifdef __cplusplus
+# include <cstdarg>
 # include <cstddef>
+# include <cstdio>
 # include <cstdlib>
 # include <cstring>
-#include <cstdarg>
 #else
+# include <stdarg.h>
+# include <stdbool.h>
 # include <stddef.h>
+# include <stdio.h>
 # include <stdlib.h>
-# include <stdbool.h>
 # include <string.h>
-# include <stdarg.h>
 #endif
 
-#include <alloca.h>
+#ifdef _WIN32
+# include <malloc.h>
+#else
+# include <alloca.h>
+#endif
 
 #ifndef __PRETTY_FUNCTION__
 # define __PRETTY_FUNCTION__ __func__
@@ -64,11 +70,11 @@
 #endif
 
 #ifndef FAIL
-# define FAIL(__message_format, ...) 
+# define FAIL(__message_format, ...)
 #endif
 
 #ifndef SKIP
-# define SKIP(__message_format, ...) 
+# define SKIP(__message_format, ...)
 #endif
 
 static inline bool valgrind_is_caller(void)
@@ -126,6 +132,22 @@ do \
   } \
 } while (0)
 
+#define SKIP_IF_(__expression, ...) \
+do \
+{ \
+  if ((__expression)) { \
+    size_t ask= snprintf(0, 0, __VA_ARGS__); \
+    ask++; \
+    char *buffer= (char*)alloca(sizeof(char) * ask); \
+    snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      SKIP(#__expression, buffer); \
+    } \
+    fprintf(stdout, "\n%s:%d: %s SKIP '%s' [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression, buffer); \
+    exit(EXIT_SKIP); \
+  } \
+} while (0)
+
 #define ASSERT_TRUE(__expression) \
 do \
 { \
@@ -158,6 +180,9 @@ do \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' != NULL [ %s ]", #__expression, buffer);\
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%s' != NULL [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression, buffer);\
     exit(EXIT_FAILURE); \
   } \
@@ -167,6 +192,9 @@ do \
 do \
 { \
   if ((__expression) == NULL) { \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' == NULL", #__expression,);\
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%s' == NULL\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression,);\
     exit(EXIT_FAILURE); \
   } \
@@ -176,28 +204,15 @@ do \
 do \
 { \
   if ((__expression) == NULL) { \
-    size_t ask= snprintf(0, 0, __VA_ARGS__); \
-    ask++; \
-    char *buffer= (char*)alloca(sizeof(char) * ask); \
-    snprintf(buffer, ask, __VA_ARGS__); \
-    fprintf(stderr, "\n%s:%d: %s Assertion '%s' == NULL [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression, buffer);\
-    exit(EXIT_FAILURE); \
-  } \
-} while (0)
-
-#define SKIP_IF_(__expression, ...) \
-do \
-{ \
-  if ((__expression)) { \
     size_t ask= snprintf(0, 0, __VA_ARGS__); \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     snprintf(buffer, ask, __VA_ARGS__); \
     if (YATL_FULL) { \
-      SKIP(#__expression, buffer); \
+      FAIL("Assertion '%s' == NULL [ %s ]", #__expression, buffer);\
     } \
-    fprintf(stdout, "\n%s:%d: %s SKIP '%s' [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression, buffer); \
-    exit(EXIT_SKIP); \
+    fprintf(stderr, "\n%s:%d: %s Assertion '%s' == NULL [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression, buffer);\
+    exit(EXIT_FAILURE); \
   } \
 } while (0)
 
@@ -209,6 +224,9 @@ do \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' [ %s ]", #__expression, buffer); \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%s' [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression, buffer); \
     exit(EXIT_FAILURE); \
   } \
@@ -218,6 +236,9 @@ do \
 do \
 { \
   if ((__expected) != (__actual)) { \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' != '%s'", #__expected, #__actual); \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%s' != '%s'\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expected, #__actual); \
     exit(EXIT_FAILURE); \
   } \
@@ -231,6 +252,9 @@ do \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' != '%s' [ %s ]", #__expected, #__actual, buffer); \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%s' != '%s' [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expected, #__actual, buffer); \
     exit(EXIT_FAILURE); \
   } \
@@ -243,6 +267,11 @@ do \
   size_t __actual_length; \
   int ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
   if (ret) { \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%.*s' != '%.*s'\n", \
+           (int)(__expected_length), (__expected_str), \
+           (int)__actual_length, (__actual_str)) ; \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%.*s' != '%.*s'\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, \
             (int)(__expected_length), (__expected_str), \
             (int)__actual_length, (__actual_str)) ; \
@@ -261,6 +290,12 @@ do \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     ask= snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%.*s' != '%.*s' [ %.*s ]", \
+           (int)(__expected_length), (__expected_str), \
+           (int)(__actual_length), (__actual_str), \
+           (int)(ask), buffer); \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%.*s' != '%.*s' [ %.*s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, \
             (int)(__expected_length), (__expected_str), \
             (int)(__actual_length), (__actual_str), \
@@ -276,6 +311,11 @@ do \
   size_t __actual_length; \
   int ret= yatl_strcmp(__expected_str, __actual_str, &__expected_length, &__actual_length); \
   if (ret == 0) { \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%.*s' == '%.*s'", \
+           (int)(__expected_length), (__expected_str), \
+           (int)__actual_length, (__actual_str)) ; \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%.*s' == '%.*s'\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, \
             (int)(__expected_length), (__expected_str), \
             (int)__actual_length, (__actual_str)) ; \
@@ -294,6 +334,12 @@ do \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     ask= snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%.*s' == '%.*s' [ %.*s ]", \
+           (int)(__expected_length), (__expected_str), \
+           (int)(__actual_length), (__actual_str), \
+           (int)(ask), buffer); \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%.*s' == '%.*s' [ %.*s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, \
             (int)(__expected_length), (__expected_str), \
             (int)(__actual_length), (__actual_str), \
@@ -306,6 +352,9 @@ do \
 do \
 { \
   if ((__expected) == (__actual)) { \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' == '%s'", #__expected, #__actual); \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%s' == '%s'\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expected, #__actual); \
     exit(EXIT_FAILURE); \
   } \
@@ -319,6 +368,9 @@ do \
     ask++; \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      FAIL("Assertion '%s' == '%s' [ %s ]", #__expected, #__actual, buffer); \
+    } \
     fprintf(stderr, "\n%s:%d: %s Assertion '%s' == '%s' [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expected, #__actual, buffer); \
     exit(EXIT_FAILURE); \
   } \
@@ -333,7 +385,7 @@ do \
     char *buffer= (char*)alloca(sizeof(char) * ask); \
     snprintf(buffer, ask, __VA_ARGS__); \
     if (YATL_FULL) { \
-      throw libtest::__failure(__FILE__, __LINE__, __PRETTY_FUNCTION__, "Assertion '!%s' [ %s ]", #__expression, buffer); \
+      FAIL("Assertion '!%s' [ %s ]", #__expression, buffer); \
     } \
     fprintf(stderr, "\n%s:%d: %s Assertion '!%s' [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression, buffer); \
     exit(EXIT_FAILURE); \