Changeset 1000:aeb202e2dbef in freeDiameter for tests

Timestamp:

Mar 21, 2013, 11:04:58 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Cleanup test messages

File:

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

tests/tests.h

@@ -69 +69 @@
 #define FAILTEST( message... ){                         \
         TRACE_ERROR(message);                           \
-        TRACE_NOTICE("Test %s failed", __FILE__);       \
+        TRACE_ERROR("FAILED: %s ", __STRIPPED_FILE__);  \
         exit(FAIL);                                     \
 }
@@ -75 +75 @@
 /* Define the macro to pass a test */
 #define PASSTEST( ){                                    \
-        TRACE_NOTICE("Test %s passed", __FILE__);       \
+        TRACE_NOTICE("PASS: %s", __STRIPPED_FILE__);    \
         (void)fd_core_shutdown();                       \
         (void)fd_core_wait_shutdown_complete();         \
@@ -89 +89 @@
 #define CHECK( _val, _assert ){                         \
         if (test_verbo > 0) {                           \
-                TRACE_DEBUG(INFO,                       \
-                        "%s:%-4d: CHECK( " #_assert " == "\
-                                #_val " )",             \
-                        __FILE__,                       \
-                        __LINE__);                      \
+                TRACE_NOTICE("CHECK( %s == %s )",       \
+                                #_assert,               \
+                                #_val);                 \
         }{                                              \
         __typeof__ (_val) __ret = (_assert);            \
         if (__ret != (_val)) {                          \
                 FAILTEST( "%s:%d: CHECK FAILED : %s == %lx != %lx",     \
-                        __FILE__,                       \
+                        __STRIPPED_FILE__,              \
                         __LINE__,                       \
                         #_assert,                       \
@@ -199 +197 @@
         CHECK( 0, fd_libproto_init() );
         
-        fd_log_threadname(basename(fname));
+        fd_log_threadname(fname);
         
         /* Parse the command line */
@@ -229 +227 @@
         return;
 }
-#define INIT_FD()  test_init(argc, argv, __FILE__);
+#define INIT_FD()  test_init(argc, argv, __STRIPPED_FILE__)
 
 #endif /* _TESTS_H */