Changeset 2:d8ce06172629 in freeDiameter for freeDiameter

Timestamp:

Aug 31, 2009, 5:32:22 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added a global debug level var

Location:

freeDiameter

Files:

• CMakeLists.txt (modified) (1 diff)
• tests/CMakeLists.txt (modified) (3 diffs)
• tests/testmesg.c (modified) (1 diff)
• tests/tests.h (modified) (4 diffs)

freeDiameter/CMakeLists.txt

@@ -18 +18 @@
 TARGET_LINK_LIBRARIES(freeDiameterd libfreeDiameter ${FD_LIBS})
 
+# Save the list of files, if needed
+SET(FD_COMMON_SRC ${FD_COMMON_SRC} PARENT_SCOPE)
+
 # The unary tests directory
 OPTION(SKIP_TESTS "Skip compilation of the tests?" OFF)

freeDiameter/tests/CMakeLists.txt

@@ -20 +20 @@
 # Some parameters for the tests
 
-# Add this flag to add some debug information in the tests themselves
 ADD_DEFINITIONS(-DTEST_DEBUG)
+ADD_DEFINITIONS(-DTRACE_LEVEL=NONE)
 
 INCLUDE_DIRECTORIES( ".." )
+INCLUDE_DIRECTORIES( "../../libfreeDiameter" )
 
 SET(TEST_COMMON_SRC "")
@@ -35 +36 @@
 # ENDFOREACH(SRC_FILE)
 
+FOREACH( SRC_FILE ${LFD_SRC})
+   SET(TEST_COMMON_SRC ${TEST_COMMON_SRC} "../../libfreeDiameter/${SRC_FILE}")
+ENDFOREACH(SRC_FILE)
+
 # Create an archive with the daemon common files (all but main)
 ADD_LIBRARY(fDcore STATIC ${TEST_COMMON_SRC})
@@ -43 +48 @@
 FOREACH( TEST ${TEST_LIST} )
    ADD_EXECUTABLE(${TEST} ${TEST}.c tests.h)
-   TARGET_LINK_LIBRARIES(${TEST} libfreeDiameter fDcore ${FD_LIBS})
+   TARGET_LINK_LIBRARIES(${TEST} fDcore ${FD_LIBS})
    ADD_TEST(${TEST} ${EXECUTABLE_OUTPUT_PATH}/${TEST})
 ENDFOREACH( TEST )

freeDiameter/tests/testmesg.c

@@ -436 +436 @@
                                 memset(&buf, 0, sizeof(buf)); /* Test that the OS value is really copied */
                                 CHECK( 0, fd_msg_update_length ( avpi ) );
-                                #if 1
+                                #if 0
                                 fd_log_debug("AVP octet string, 'This\\0 is a b...'\n");
                                 fd_msg_dump_one(0, avpi);

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 " == "\
@@ -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);