commit 41a145141057ce9773f8a9dc456a34ff1b2f9058
author Benny Prijono <bennylp@teluu.com> Sat Aug 15 10:05:36 2009 +0000
committer Benny Prijono <bennylp@teluu.com> Sat Aug 15 10:05:36 2009 +0000
tree a20cf70d86ba9e61bf9f79a3945e258645ca93ef
parent 3ee562cbbcb49212d5d24557283ee6844030789a

Ticket #944: misc fixes in pjmedia_test:
 - Assertion in pjmedia tests's MIPS test with iLBC codec due to ptime mismatch
 - added compile time macro in test.h to enable/disable specific tests
 - also added SVN keyword expansion attributes to the source files



git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@2882 74dad513-b988-da41-8d7b-12977e46ad98

pjmedia/src/test/mips_test.c

diff --git a/pjmedia/src/test/mips_test.c b/pjmedia/src/test/mips_test.c
index dfde5fb..86797e0 100644
--- a/pjmedia/src/test/mips_test.c
+++ b/pjmedia/src/test/mips_test.c
@@ -387,6 +387,7 @@
     const char	    *title;
     unsigned	     valid_op;
     unsigned	     valid_clock_rate;
+
     pjmedia_port*  (*init)(pj_pool_t *pool,
 			  unsigned clock_rate,
 			  unsigned channel_count,
@@ -833,6 +834,7 @@
 					 unsigned flags,
 					 struct test_entry *te)
 {
+    samples_per_frame = 30 * clock_rate / 1000;
     return codec_encode_decode(pool, "ilbc", &ilbc_init, 
 			       &pjmedia_codec_ilbc_deinit, clock_rate, 
 			       channel_count, samples_per_frame, flags, te);
@@ -2216,6 +2218,9 @@
 	return t0;
     }
 
+    /* Port may decide to use different ptime (e.g. iLBC) */
+    samples_per_frame = port->info.samples_per_frame;
+
     gen_port = create_gen_port(pool, clock_rate, 1, 
 			       samples_per_frame, 100);
     if (gen_port == NULL) {

pjmedia/src/test/test.c

diff --git a/pjmedia/src/test/test.c b/pjmedia/src/test/test.c
index d5bfd4e..385eee1 100644
--- a/pjmedia/src/test/test.c
+++ b/pjmedia/src/test/test.c
@@ -56,13 +56,21 @@
 
     mem = &caching_pool.factory;
 
+#if HAS_SDP_NEG_TEST
     DO_TEST(sdp_neg_test());
+#endif
     //DO_TEST(sdp_test (&caching_pool.factory));
     //DO_TEST(rtp_test(&caching_pool.factory));
     //DO_TEST(session_test (&caching_pool.factory));
+#if HAS_JBUF_TEST
     DO_TEST(jbuf_main());
+#endif
+#if HAS_MIPS_TEST
     DO_TEST(mips_test());
+#endif
+#if HAS_CODEC_VECTOR_TEST
     DO_TEST(codec_test_vectors());
+#endif
 
     PJ_LOG(3,(THIS_FILE," "));
 

pjmedia/src/test/test.h

diff --git a/pjmedia/src/test/test.h b/pjmedia/src/test/test.h
index 267be12..96dc9d5 100644
--- a/pjmedia/src/test/test.h
+++ b/pjmedia/src/test/test.h
@@ -23,6 +23,10 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
+#define HAS_SDP_NEG_TEST	1
+#define HAS_JBUF_TEST		1
+#define HAS_MIPS_TEST		1
+#define HAS_CODEC_VECTOR_TEST	1
 
 int session_test(void);
 int rtp_test(void);