Thu Mar 5 12:29:30 CST 2009 Pekka Pessi <first.last@nokia.com>

  * s2base.h: added S2_CASE(), added test function name to s2_case() parameters
  Ignore-this: c9ceff2812044e2643c21548be29233e

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12734 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 012d445ced2fad5dd6f5b82e6895f462529faf8c..71182907033b4f4bb50adf8c40d5e158c2637dfb 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Mar 24 10:31:53 CDT 2009
+Tue Mar 24 10:32:33 CDT 2009

diff --git a/libs/sofia-sip/s2check/s2base.c b/libs/sofia-sip/s2check/s2base.c
index df77763dcdca541a1ef92cdf2a22e4dcc2ad0547..a67ae127f8f976a2eb2dda1b07beaf9ef44a2446 100644 (file)
--- a/libs/sofia-sip/s2check/s2base.c
+++ b/libs/sofia-sip/s2check/s2base.c
@@ -126,13 +126,15 @@ void s2_setup(char const *label)
 
 void s2_case(char const *number,
             char const *title,
-            char const *description)
+            char const *description,
+            char const *function)
 {
   stamps.start = now();
 
   _s2_case = number;
   if (s2_start_stop)
-    printf("%s - starting %s/%s-%s\n", s2_tester, _s2_suite, _s2_case, title);
+    printf("%s - starting %s (%s/%s %s)\n", s2_tester, function,
+          _s2_suite, _s2_case, title);
 }
 
 void s2_step(void)

diff --git a/libs/sofia-sip/s2check/s2base.h b/libs/sofia-sip/s2check/s2base.h
index 598954747df3f2f82a93c8340eb807f0c42cdcb6..0e602836fc1b49e1c9395b933dbd76f4a62640a7 100644 (file)
--- a/libs/sofia-sip/s2check/s2base.h
+++ b/libs/sofia-sip/s2check/s2base.h
@@ -44,7 +44,16 @@ void s2_step(void);
 
 void s2_case(char const *tag,
             char const *title,
-            char const *description);
+            char const *description,
+            char const *function);
+
+#if HAVE_FUNC
+#define S2_CASE(n, t, d) s2_case((n),(t),(d), __func__)
+#elif HAVE_FUNCTION
+#define S2_CASE(n, t, d) s2_case((n),(t),(d), __FUNCTION__)
+#else
+#define S2_CASE(n, t, d) s2_case((n),(t),(d), "")
+#endif
 
 void s2_teardown_started(char const *label);
 void s2_teardown(void);