[Freeswitch-trunk] [commit] r12734 - in freeswitch/trunk/libs/sofia-sip: . s2check

[FreeSWITCH SVN]

Author: mikej
Date: Tue Mar 24 10:33:33 2009
New Revision: 12734

Log:
Thu Mar  5 12:29:30 CST 2009  Pekka Pessi <first.last at nokia.com>
  * s2base.h: added S2_CASE(), added test function name to s2_case() parameters
  Ignore-this: c9ceff2812044e2643c21548be29233e


Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/s2check/s2base.c
   freeswitch/trunk/libs/sofia-sip/s2check/s2base.h

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar 24 10:33:33 2009
@@ -1 +1 @@
-Tue Mar 24 10:31:53 CDT 2009
+Tue Mar 24 10:32:33 CDT 2009

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2base.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c	Tue Mar 24 10:33:33 2009
@@ -126,13 +126,15 @@
 
 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)

Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/s2check/s2base.h	(original)
+++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.h	Tue Mar 24 10:33:33 2009
@@ -44,7 +44,16 @@
 
 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);