Changeset 1088:1d1a20a0779d in freeDiameter for tests/tests.h

Timestamp:

May 5, 2013, 4:25:27 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Second part of changeset 1083, now the code compiles again. Still missing some functions implementation, though

File:

• tests/tests.h (modified) (4 diffs)

tests/tests.h

@@ -68 +68 @@
 /* Define the macro to fail a test with a message */
 #define FAILTEST( message... ){                         \
-        TRACE_ERROR(message);                           \
-        TRACE_ERROR("FAILED: %s ", __STRIPPED_FILE__);  \
+        LOG_F(message);                                 \
+        LOG_F("FAILED: %s ", __STRIPPED_FILE__);        \
+        free(tbuf);                                     \
         exit(FAIL);                                     \
 }
@@ -75 +76 @@
 /* Define the macro to pass a test */
 #define PASSTEST( ){                                    \
-        TRACE_NOTICE("PASS: %s", __STRIPPED_FILE__);    \
+        LOG_N("PASS: %s", __STRIPPED_FILE__);           \
         (void)fd_core_shutdown();                       \
         (void)fd_core_wait_shutdown_complete();         \
         (void)fd_thr_term(&signal_thr);                 \
+        free(tbuf);                                     \
         exit(PASS);                                     \
 }
 
-static int test_verbo = 0;
 static struct fd_config conf;
 extern struct fd_config * fd_g_config;
 
+/* for dumps */
+static char * tbuf = NULL; size_t tbuflen = 0;
+#define FD_DUMP_TEST_PARAMS &tbuf, &tbuflen, NULL
+
+
 /* Define the standard check routines */
 #define CHECK( _val, _assert ){                         \
-        if (test_verbo > 0) {                           \
-                TRACE_NOTICE("CHECK( %s == %s )",       \
+        LOG_D("CHECK( %s == %s )",                      \
                                 #_assert,               \
                                 #_val);                 \
-        }{                                              \
+        {                                               \
         __typeof__ (_val) __ret = (_assert);            \
         if (__ret != (_val)) {                          \
@@ -143 +148 @@
                 switch (c) {
                         case 'd':       /* Increase verbosity of debug messages.  */
-                                test_verbo++;
+                                fd_g_debug_lvl--;
                                 break;
                                 
                         case 'q':       /* Decrease verbosity.  */
-                                test_verbo--;
+                                fd_g_debug_lvl++;
                                 break;
                         
@@ -178 +183 @@
                 }
         }
-        fd_g_debug_lvl = (test_verbo > 0) ? (test_verbo - 1) : 0;
         if (!no_timeout) {
                 alarm(TEST_TIMEOUT);