nua: moved test_nua contents in ltlibraries

darcs-hash:20071129180344-65a35-bd5a40416ff13ed9e5f7a2d27578b4f395a4ac51.gz

libsofia-sip-ua/nua/Makefile.am

@@ -11,7 +11,7 @@
 # ----------------------------------------------------------------------
 # Build targets
 
-noinst_LTLIBRARIES = 	libnua.la
+noinst_LTLIBRARIES = 	libnua.la libtestnua.la libtestproxy.la libtestnat.la
 
 check_PROGRAMS =	test_nua
 
@@ -41,7 +41,26 @@ libnua_la_SOURCES = 	nua.c nua_stack.h nua_common.c nua_stack.c \
 
 COVERAGE_INPUT = 	$(libnua_la_SOURCES) $(include_sofia_HEADERS)
 
-LDADD = 		libnua.la \
+test_nua_LDFLAGS = 	-static
+
+libtestnua_la_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
+
+libtestproxy_la_SOURCES = test_proxy.h test_proxy.c
+
+libtestnat_la_SOURCES = test_nat.h test_nat.c test_nat_tags.c
+
+test_nua_SOURCES = 	test_nua.c 
+
+test_nua_LDADD = 	libnua.la libtestnua.la libtestproxy.la libtestnat.la \
 			../iptsec/libiptsec.la \
 			../ipt/libipt.la \
 			../nea/libnea.la \
@@ -58,21 +77,6 @@ LDADD = 		libnua.la \
 			../bnf/libbnf.la \
 			../su/libsu.la
 
-test_nua_LDFLAGS = 	-static
-
-test_nua_SOURCES = 	test_nua.c 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 \
-			test_proxy.h test_proxy.c \
-			test_nat.h test_nat.c test_nat_tags.c
-
 # ----------------------------------------------------------------------
 # Install and distribution rules
 

libsofia-sip-ua/nua/test_init.c

@@ -408,6 +408,7 @@ int test_deinit(struct context *ctx)
 
     nua_shutdown(ctx->a.nua);
     run_a_until(ctx, nua_r_shutdown, until_final_response);
+    free_events_in_list(ctx, ctx->a.events);
     free_events_in_list(ctx, ctx->a.specials);
     nua_destroy(ctx->a.nua), ctx->a.nua = NULL;
   }
@@ -418,6 +419,7 @@ int test_deinit(struct context *ctx)
 
     nua_shutdown(ctx->b.nua);
     run_b_until(ctx, nua_r_shutdown, until_final_response);
+    free_events_in_list(ctx, ctx->b.events);
     free_events_in_list(ctx, ctx->b.specials);
     nua_destroy(ctx->b.nua), ctx->b.nua = NULL;
   }
@@ -428,6 +430,7 @@ int test_deinit(struct context *ctx)
 
     nua_shutdown(ctx->c.nua);
     run_c_until(ctx, nua_r_shutdown, until_final_response);
+    free_events_in_list(ctx, ctx->c.events);
     free_events_in_list(ctx, ctx->c.specials);
     nua_destroy(ctx->c.nua), ctx->c.nua = NULL;
   }
@@ -436,7 +439,7 @@ int test_deinit(struct context *ctx)
 
   test_nat_destroy(ctx->nat), ctx->nat = NULL;
 
-  su_root_destroy(ctx->root);
+  su_root_destroy(ctx->root), ctx->root = NULL;
 
   END();
 }

libsofia-sip-ua/nua/test_nua.h

@@ -22,7 +22,8 @@
  *
  */
 
-/**@CFILE test_nua.h
+/**@@internal
+ * @file test_nua.h
  * @brief High-level tester framework for Sofia SIP User Agent Engine
  *
  * @author Pekka Pessi <Pekka.Pessi@nokia.com>