Changes in freeDiameter/tests/tests.h [1:bafb831ba688:3:ef303f1078ab] in freeDiameter

File:

• freeDiameter/tests/tests.h (modified) (5 diffs)

freeDiameter/tests/tests.h

@@ -52 +52 @@
 #endif /* TEST_TIMEOUT */
 
-static int test_verbosity = 0;
-
 /* Standard includes */
 #include <getopt.h>
@@ -76 +74 @@
 }
 
+static int test_verbo = 0;
+
 /* Define the standard check routines */
 #define CHECK( _val, _assert ){                         \
-        if (test_verbosity > 0) {                       \
+        if (test_verbo > 0) {                           \
                 fprintf(stderr,                         \
                         "%s:%-4d: CHECK( " #_assert " == "\
@@ -98 +98 @@
 /* Minimum inits */
 #define INIT_FD() {                                     \
-        pthread_key_create(&fd_log_thname, free);       \
+        CHECK( 0, fd_lib_init() );                      \
         fd_log_threadname(basename(__FILE__));          \
         CHECK( 0, fd_dict_init(&fd_g_dict) );           \
@@ -111 +111 @@
                 switch (c) {
                         case 'd':       /* Increase verbosity of debug messages.  */
-                                test_verbosity++;
+                                test_verbo++;
                                 break;
                                 
-                        case 'q':       /* Decrease verbosity then remove debug messages.  */
-                                test_verbosity--;
+                        case 'q':       /* Decrease verbosity.  */
+                                test_verbo--;
                                 break;
                         
@@ -126 +126 @@
                 }
         }
+        fd_g_debug_lvl = (test_verbo > 0) ? (test_verbo - 1) : 0;
         if (!no_timeout)
                 alarm(TEST_TIMEOUT);