Changeset 658:f198d16fa7f4 in freeDiameter for tests

Timestamp:

Jan 14, 2011, 3:15:23 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Initial commit for 1.1.0:

• Restructuring:
  • libfreeDiameter:
    • renamed folder & binary into libfdproto
    • renamed libfD.h into fdproto-internal.h
    • removed signals management (replaced by triggers in libfdcore)

• freeDiameter split into:
  • libfdcore (most contents)
    • renamed fD.h into fdcore-internal.h
    • added core.c for framework init/shutdown.
    • new triggers mechanism in events.c.

• freeDiameterd (main, command line parsing, signals management)

• tests:
  • now in top-level directory tests.

• other changes:
  • fd_dict_new now returns 0 on duplicate identical entries.
  • fixes in dict_legacy_xml
  • fixes in some dictionaries
  • moved FD_DEFAULT_CONF_FILENAME definition to freeDiameter-host.h

Location:

tests

Files:

• CMakeLists.txt (moved) (moved from freeDiameter/tests/CMakeLists.txt) (5 diffs)
• testappacct.c (moved) (moved from freeDiameter/tests/testappacct.c)
• testcnx.c (moved) (moved from freeDiameter/tests/testcnx.c)
• testdict.c (moved) (moved from freeDiameter/tests/testdict.c)
• testdisp.c (moved) (moved from freeDiameter/tests/testdisp.c)
• testfifo.c (moved) (moved from freeDiameter/tests/testfifo.c)
• testlist.c (moved) (moved from freeDiameter/tests/testlist.c)
• testmesg.c (moved) (moved from freeDiameter/tests/testmesg.c)
• tests.h (moved) (moved from freeDiameter/tests/tests.h) (4 diffs)
• testsctp.c (moved) (moved from freeDiameter/tests/testsctp.c)
• testsess.c (moved) (moved from freeDiameter/tests/testsess.c)

tests/CMakeLists.txt

@@ -1 +1 @@
 # Test directory
-PROJECT("libfreeDiameter tests" C)
+PROJECT("freeDiameter tests" C)
 
 # give the possibility to configure the timeout duration for the tests
@@ -28 +28 @@
 ADD_DEFINITIONS(-DTRACE_LEVEL=NONE)
 
-INCLUDE_DIRECTORIES( ".." )
-INCLUDE_DIRECTORIES( "../../libfreeDiameter" )
-
-BISON_FILE(../fdd.y)
-FLEX_FILE(../fdd.l)
-
-SET(TEST_COMMON_SRC "")
-
-FOREACH( SRC_FILE ${FD_COMMON_SRC})
-   SET(TEST_COMMON_SRC ${TEST_COMMON_SRC} "../${SRC_FILE}")
-ENDFOREACH(SRC_FILE)
-
-FOREACH( SRC_FILE ${FD_COMMON_GEN_SRC})
-   SET(TEST_COMMON_SRC ${TEST_COMMON_SRC} "${CMAKE_CURRENT_BINARY_DIR}/../${SRC_FILE}")
-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})
+INCLUDE_DIRECTORIES( "../libfdproto" )
+INCLUDE_DIRECTORIES( "../libfdcore" )
 
 
@@ -72 +52 @@
 
                 # List of source files, copied from the extension CMakeLists.
-                BISON_FILE(../../extensions/app_acct/acct_conf.y)
-                FLEX_FILE(../../extensions/app_acct/acct_conf.l)
+                BISON_FILE(../extensions/app_acct/acct_conf.y)
+                FLEX_FILE(../extensions/app_acct/acct_conf.l)
                 #SET_SOURCE_FILES_PROPERTIES(lex.acct_conf.c acct_conf.tab.c PROPERTIES COMPILE_FLAGS "-I ${CMAKE_CURRENT_SOURCE_DIR}")
                 
@@ -89 +69 @@
 
                 # The extension headers
-                INCLUDE_DIRECTORIES( "../../extensions/app_acct" )
+                INCLUDE_DIRECTORIES( "../extensions/app_acct" )
 
                 SET(testappacct_ADDITIONAL "")
 
                 FOREACH( SRC_FILE ${APP_ACCT_SRC})
-                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "../../extensions/app_acct/${SRC_FILE}")
+                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "../extensions/app_acct/${SRC_FILE}")
                 ENDFOREACH(SRC_FILE)
 
                 FOREACH( SRC_FILE ${APP_ACCT_SRC_GEN})
-                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "${CMAKE_CURRENT_BINARY_DIR}/../../extensions/app_acct/${SRC_FILE}")
+                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "${CMAKE_CURRENT_BINARY_DIR}/../extensions/app_acct/${SRC_FILE}")
                 ENDFOREACH(SRC_FILE)
 
@@ -109 +89 @@
 FOREACH( TEST ${TEST_LIST} )
    ADD_EXECUTABLE(${TEST} ${TEST}.c tests.h ${${TEST}_ADDITIONAL})
-   TARGET_LINK_LIBRARIES(${TEST} fDcore ${FD_LIBS} ${LFD_LIBS} ${${TEST}_ADDITIONAL_LIB})
+   TARGET_LINK_LIBRARIES(${TEST} libfdproto libfdcore ${${TEST}_ADDITIONAL_LIB})
    ADD_TEST(${TEST} ${EXECUTABLE_OUTPUT_PATH}/${TEST})
 ENDFOREACH( TEST )

tests/tests.h

@@ -42 +42 @@
 #define _TESTS_H
 
-#include "libfD.h"
-#include "fD.h"
+#include "fdproto-internal.h"
+#include "fdcore-internal.h"
 
 #include <pthread.h>
@@ -82 +82 @@
 struct fd_config * fd_g_config = &conf;
 
-/* gcrypt functions to support posix threads */
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
 /* Define the standard check routines */
 #define CHECK( _val, _assert ){                         \
@@ -105 +102 @@
 }
 
-/* Minimum inits */
-#define INIT_FD() {                                                             \
-        memset(fd_g_config, 0, sizeof(struct fd_config));                       \
-        CHECK( 0, fd_lib_init(1) );                                             \
-        fd_log_threadname(basename(__FILE__));                                  \
-        (void) gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);    \
-        (void) gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);                   \
-        CHECK( 0, gnutls_global_init());                                        \
-        CHECK( 0, fd_conf_init() );                                             \
-        CHECK( 0, fd_dict_base_protocol(fd_g_config->cnf_dict) );               \
-        CHECK( 0, fd_sess_start() );                                            \
-        parse_cmdline(argc, argv);                                              \
+static pthread_t timeout_thr;
+static void * timeout_catch(void * arg)
+{
+        int sig;
+        sigset_t ss;
+        fd_log_threadname ( "timeout catcher" );
+        
+        sigemptyset(&ss);
+        sigaddset(&ss, SIGALRM);
+        
+        CHECK_POSIX_DO( sigwait(&ss, &sig),  );
+        
+        FAILTEST("The timeout (" _stringize(TEST_TIMEOUT) " sec) was reached. Use -n or change TEST_TIMEOUT if the test needs more time to execute.");
+        
+        return NULL;
 }
+        
 
-static void test_timeout(int signal)
-{
-        FAILTEST("The timeout (" _stringize(TEST_TIMEOUT) " sec) was reached. Use -n or change TEST_TIMEOUT if the test needs more time to execute.");
-}
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 static inline void parse_cmdline(int argc, char * argv[]) {
@@ -164 +162 @@
         if (!no_timeout) {
                 alarm(TEST_TIMEOUT);
-                fd_sig_register(SIGALRM, "Test.harness", test_timeout);
+                CHECK( 0, pthread_create(&timeout_thr, NULL, timeout_catch, NULL) );
         }
 }
  
+static inline void test_init(int argc, char * argv[])
+{
+        memset(fd_g_config, 0, sizeof(struct fd_config));
+        
+        CHECK( 0, fd_libproto_init() );
+        
+        fd_log_threadname(basename(__FILE__));
+        
+        /* Initialize gcrypt and gnutls */
+        (void) gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+        (void) gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+        CHECK( 0, gnutls_global_init());
+        
+        /* Initialize the config */
+        CHECK( 0, fd_conf_init() );
+
+        /* Add definitions of the base protocol */
+        CHECK( 0, fd_dict_base_protocol(fd_g_config->cnf_dict) );
+        
+        /* Initialize only the sessions */
+        CHECK( 0, fd_sess_start()  );
+        
+        /* Parse the command line */
+        parse_cmdline(argc, argv);
+        
+        return;
+}
+#define INIT_FD()  test_init(argc, argv);
+
 #endif /* _TESTS_H */