Thu Mar 5 11:44:15 CST 2009 Pekka Pessi <first.last@nokia.com>

  * s2check.h: redefine tcase_add_loop_test, too
  Ignore-this: 149c19e8d089b60e8ddcb98da54c9d88

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

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

diff --git a/libs/sofia-sip/s2check/s2check.h b/libs/sofia-sip/s2check/s2check.h
index 4197d5842054670a2a620b0d4ae96db11f90a455..47b94552b57dc07862251291338b47cba691b30e 100644 (file)
--- a/libs/sofia-sip/s2check/s2check.h
+++ b/libs/sofia-sip/s2check/s2check.h
@@ -42,10 +42,16 @@
 SOFIA_BEGIN_DECLS
 
 #undef tcase_add_test
+#undef tcase_add_loop_test
+
 /* Redirect tcase_add_test() to our function */
-#define tcase_add_test(tc, tf) s2_tcase_add_test(tc, tf, "" #tf "")
+#define tcase_add_test(tc, tf) s2_tcase_add_test(tc, tf, "" #tf "", 0, 0, 1)
+
+void s2_tcase_add_test(TCase *, TFun, char const *name,
+                      int signo, int start, int end);
 
-void s2_tcase_add_test(TCase *, TFun, char const *name);
+#define tcase_add_loop_test(tc, tf, s, e) \
+  s2_tcase_add_test(tc, tf, "" #tf "", 0, (s), (e))
 
 void s2_select_tests(char const *pattern);
 

diff --git a/libs/sofia-sip/s2check/s2tcase.c b/libs/sofia-sip/s2check/s2tcase.c
index 285ec0278d49cbd3a50424d1ba57ac35f9d1a744..d67694c2ce47be90c15c38c2b13c94eb4098487a 100644 (file)
--- a/libs/sofia-sip/s2check/s2tcase.c
+++ b/libs/sofia-sip/s2check/s2tcase.c
@@ -46,7 +46,8 @@ static char const * const *test_patterns = default_patterns;
  * A special version of tcase_add_test() that inserts test function into
  * tcase only if its name matches given pattern.
  */
-void s2_tcase_add_test(TCase *tc, TFun tf, char const *name)
+void s2_tcase_add_test(TCase *tc, TFun tf, char const *name,
+                      int signo, int start, int end)
 {
   char const * const *patterns;
 
@@ -54,9 +55,9 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name)
   for (patterns = test_patterns; *patterns; patterns++) {
     if (!fnmatch(*patterns, name, 0)) {
       if (strcmp(*patterns, "*")) {
-       printf("%s: running\n", name);
+       printf("%s: selected\n", name);
       }
-      _tcase_add_test(tc, tf, name, 0, 0, 1);
+      _tcase_add_test(tc, tf, name, signo, start, end);
       return;
     }
   }
@@ -64,9 +65,9 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name)
   for (patterns = test_patterns; *patterns; patterns++) {
     if (!strcmp(*patterns, name) || !strcmp(*patterns, "*")) {
       if (strcmp(*patterns, "*")) {
-       printf("%s: running\n", name);
+       printf("%s: selected\n", name);
       }
-      _tcase_add_test(tc, tf, name, 0, 0, 1);
+      _tcase_add_test(tc, tf, name, signo, start, end);
       return;
     }
   }