[Freeswitch-svn] [commit] r8400 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua tests

Freeswitch SVN mikej at freeswitch.org
Wed May 14 14:19:34 EDT 2008


Author: mikej
Date: Wed May 14 14:19:34 2008
New Revision: 8400

Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
   freeswitch/trunk/libs/sofia-sip/tests/Makefile.am
   freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c

Log:
Update sofia tests:

Tue May  6 13:53:21 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * tests: added 2nd check-based test suite for nua

Wed May  7 08:26:48 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * suite2_for_nua.c: more test cases

Wed May  7 13:40:05 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * suite2_for_nua.c, s2tester.[hc]: made it easier to refactor test cases

Wed May  7 14:34:54 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * test_nua: moved to tests subdirectory

Wed May  7 14:37:06 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * check_nua: moved to libsofia-sip-ua/nua

Mon May 12 19:00:26 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * check_nua: updated

Tue May 13 16:45:21 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * test_s2.h, test_s2.c: added internal DNS server

Tue May 13 16:46:08 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * check_register.c: added test case register_1_3_3_1 using tcp pingpong



Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed May 14 14:19:34 2008
@@ -1 +1 @@
-Wed May 14 14:16:11 EDT 2008
+Wed May 14 14:17:15 EDT 2008

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am	Wed May 14 14:19:34 2008
@@ -13,13 +13,13 @@
 
 noinst_LTLIBRARIES = 	libnua.la
 
-check_LTLIBRARIES = 	libtestnua.la libtestproxy.la libtestnat.la
+check_PROGRAMS =
+TESTS =
 
-check_PROGRAMS =	test_nua
-
-TESTS = 		test_nua
-
-CLEANFILES =           tmp_sippasswd.??????
+if HAVE_CHECK
+check_PROGRAMS +=	check_nua
+TESTS += 		check_nua
+endif
 
 # ----------------------------------------------------------------------
 # Rules for building the targets
@@ -43,6 +43,29 @@
 
 COVERAGE_INPUT = 	$(libnua_la_SOURCES) $(include_sofia_HEADERS)
 
+check_nua_SOURCES = 	check_nua.c check_nua.h \
+			check_session.c check_register.c \
+			test_s2.h test_s2.c
+
+check_nua_LDADD = 	$(nua_libs) @CHECK_LIBS@
+
+nua_libs = 		libnua.la  \
+			../iptsec/libiptsec.la \
+			../ipt/libipt.la \
+			../nea/libnea.la \
+			../nta/libnta.la \
+			../sresolv/libsresolv.la \
+			../tport/libtport.la \
+			../stun/libstun.la \
+			../soa/libsoa.la \
+			../sdp/libsdp.la \
+			../sip/libsip.la \
+			../http/libhttp.la \
+			../msg/libmsg.la \
+			../url/liburl.la \
+			../bnf/libbnf.la \
+			../su/libsu.la
+
 test_nua_LDFLAGS = 	-static
 
 libtestnua_la_SOURCES = test_nua.h test_ops.c \
@@ -80,6 +103,7 @@
 			../bnf/libbnf.la \
 			../su/libsu.la
 
+^ ^ ^ ^ ^ ^ ^
 # ----------------------------------------------------------------------
 # Install and distribution rules
 

Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/tests/Makefile.am	(original)
+++ freeswitch/trunk/libs/sofia-sip/tests/Makefile.am	Wed May 14 14:19:34 2008
@@ -1,35 +1,63 @@
 #
-# Tests using check
+# Makefile.am for Sofia SIP tests
 #
+# Copyright (C) 2007,2008 Nokia Corporation
+# Contact: Pekka Pessi <pekka.pessi at nokia.com>
+# Licensed under LGPL. See file COPYING.
+
+TESTS = test_nua
+check_PROGRAMS = test_nua
 
 EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c
 
-TESTS =
-tests_PROGRAMS =
-testsdir := ${libdir}/tests/libsofia-sip-ua-tests
+test_nua_SOURCES = 	test_nua.c
 
-include $(top_srcdir)/rules/sofia.am
+test_nua_LDADD =	$(check_LIBRARIES) \
+			${sofiabuilddir}/libsofia-sip-ua.la
 
-INCLUDES = ${INTERNAL_INCLUDES}
+check_LIBRARIES =   	libtestnua.a libtestproxy.a libtestnat.a
 
-AM_CFLAGS += @CHECK_CFLAGS@
+libtestnua_a_SOURCES =	test_nua.h test_ops.c \
+			test_init.c \
+			test_nua_api.c test_nua_params.c \
+			test_register.c test_basic_call.c \
+			test_offer_answer.c \
+			test_call_reject.c test_cancel_bye.c \
+			test_call_hold.c test_session_timer.c \
+			test_refer.c test_100rel.c \
+			test_simple.c test_sip_events.c \
+			test_extension.c
 
-if HAVE_CHECK
+libtestproxy_a_SOURCES = test_proxy.h test_proxy.c
+
+libtestnat_a_SOURCES =	test_nat.h test_nat.c test_nat_tags.c
 
+#
+# Install in special test package
+#
+testsdir = 		${libdir}/tests/libsofia-sip-ua-tests
+tests_PROGRAMS =
+
+if HAVE_CHECK
 TESTS += check_sofia
 tests_PROGRAMS += check_sofia
+endif
+
+check_sofia_CFLAGS = @CHECK_CFLAGS@
+
 
 check_sofia_SOURCES = check_sofia.c check_sofia.h \
 	suite_for_nua.c
 
-CHECKLIBS = ${sofiabuilddir}/nua/libtestnua.la \
-	${sofiabuilddir}/nua/libtestproxy.la \
-	${sofiabuilddir}/nua/libtestnat.la
-
-$(CHECKLIBS):
-	cd ${sofiabuilddir}/nua && make checklib
-
-check_sofia_LDADD = \
-	$(CHECKLIBS) ${sofiabuilddir}/libsofia-sip-ua.la \
-	@CHECK_LIBS@
-endif
+check_sofia_LDADD = 	$(check_LIBRARIES) \
+			${sofiabuilddir}/libsofia-sip-ua.la \
+			@CHECK_LIBS@
+
+CLEANFILES =            tmp_sippasswd.??????
+
+# ----------------------------------------------------------------------
+# Sofia specific rules
+
+include $(top_srcdir)/rules/sofia.am
+
+INCLUDES = ${INTERNAL_INCLUDES}

Modified: freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c	Wed May 14 14:19:34 2008
@@ -22,7 +22,7 @@
  *
  */
 
-/**@CFILE check_sofia.c
+/**@CFILE suite_for_nua.c
  *
  * @brief Check-driven tester for Sofia SIP User Agent library
  *



More information about the Freeswitch-svn mailing list