diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-04-02 18:00:45 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-04-02 18:00:45 +0000 |
| commit | 95fd29d51de71c2a861925be5227fa4a32bcaf3f (patch) | |
| tree | 42fb98d0f09f52219e3dfa2299ddecaaa3749704 | |
| parent | 85418341645e51f9c0a770eb4cd22e33fcb59cc0 (diff) | |
Enable all tests in pjnath-test
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1129 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjnath/include/pjnath/ice_session.h | 4 | ||||
| -rw-r--r-- | pjnath/src/pjnath-test/ice_test.c | 6 | ||||
| -rw-r--r-- | pjnath/src/pjnath-test/test.c | 2 | ||||
| -rw-r--r-- | pjnath/src/pjnath/ice_session.c | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/pjnath/include/pjnath/ice_session.h b/pjnath/include/pjnath/ice_session.h index 36ad1b27..14b9e3d3 100644 --- a/pjnath/include/pjnath/ice_session.h +++ b/pjnath/include/pjnath/ice_session.h @@ -606,9 +606,6 @@ PJ_DECL(pj_status_t) pj_ice_sess_add_cand(pj_ice_sess *ice, int addr_len, unsigned *p_cand_id); -#if 0 -/* Temporarily disabled to reduce size, since we don't need this yet */ - /** * Find default candidate for the specified component ID, using this * rule: @@ -626,7 +623,6 @@ PJ_DECL(pj_status_t) pj_ice_sess_add_cand(pj_ice_sess *ice, PJ_DECL(pj_status_t) pj_ice_sess_find_default_cand(pj_ice_sess *ice, unsigned comp_id, int *p_cand_id); -#endif /** * Pair the local and remote candidates to create check list. Application diff --git a/pjnath/src/pjnath-test/ice_test.c b/pjnath/src/pjnath-test/ice_test.c index f176dc5b..2933a088 100644 --- a/pjnath/src/pjnath-test/ice_test.c +++ b/pjnath/src/pjnath-test/ice_test.c @@ -459,11 +459,11 @@ int ice_test(void) pj_stun_config_init(&stun_cfg, mem, 0, ioqueue, timer_heap); -#if 1 +#if 0 pj_log_set_level(5); #endif - goto test; + //goto test; /* Basic create/destroy */ rc = ice_basic_create_destroy_test(); @@ -491,7 +491,7 @@ int ice_test(void) goto on_return; /* Direct communication with two components */ -test: +//test: rc = perform_ice_test("With two components (RTP and RTCP)", PJ_TRUE, 2, PJ_TRUE, D1, D2, 0, NULL, 0, NULL); if (rc != 0) goto on_return; diff --git a/pjnath/src/pjnath-test/test.c b/pjnath/src/pjnath-test/test.c index 3dc2085d..1542bcdd 100644 --- a/pjnath/src/pjnath-test/test.c +++ b/pjnath/src/pjnath-test/test.c @@ -49,7 +49,7 @@ static int test_inner(void) mem = &caching_pool.factory; -#if 0 +#if 1 pj_log_set_level(3); pj_log_set_decor(PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | PJ_LOG_HAS_MICRO_SEC); diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c index 50c593bd..5365ca6a 100644 --- a/pjnath/src/pjnath/ice_session.c +++ b/pjnath/src/pjnath/ice_session.c @@ -555,7 +555,6 @@ on_error: /* Find default candidate ID for the component */ -#if 0 PJ_DEF(pj_status_t) pj_ice_sess_find_default_cand(pj_ice_sess *ice, unsigned comp_id, int *cand_id) @@ -623,7 +622,6 @@ PJ_DEF(pj_status_t) pj_ice_sess_find_default_cand(pj_ice_sess *ice, pj_assert(!"Should have a candidate by now"); return PJ_EBUG; } -#endif /* if 0 */ #ifndef MIN |