From 655ce29aac04916a36b2d279b00ec5f9ce7f6659 Mon Sep 17 00:00:00 2001 From: Jonathan Rose <jrose@digium.com> Date: Tue, 17 Dec 2013 23:57:52 +0000 Subject: [PATCH] tests: fix ast_bridge_base_new calls not using the additional arguments r404042 gave ast_bridge_base_new two new arguments for setting a bridge creator and name. Unfortunately since a couple test modules aren't compiled by default, I missed the fact that this change impacted those tests and caused compilation failures against them. ........ Merged revisions 404048 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404049 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- tests/test_cdr.c | 3 ++- tests/test_cel.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/test_cdr.c b/tests/test_cdr.c index 57d5b2e32d..6d1626b368 100644 --- a/tests/test_cdr.c +++ b/tests/test_cdr.c @@ -2007,7 +2007,8 @@ AST_TEST_DEFINE(test_cdr_park) bridge = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_HOLDING, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM - | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED); + | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED, + "test_cdr", "test_cdr_park"); ast_test_validate(test, bridge != NULL); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); diff --git a/tests/test_cel.c b/tests/test_cel.c index 0aa8b601c9..7732f3e9dd 100644 --- a/tests/test_cel.c +++ b/tests/test_cel.c @@ -1319,7 +1319,8 @@ AST_TEST_DEFINE(test_cel_attended_transfer_bridges_merge) } /* Create first set of bridged parties */ bridge1 = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE | AST_BRIDGE_CAPABILITY_MULTIMIX, - AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART); + AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART, + "test_cel", "test_cel_atxfer_bridges_merge_1"); ast_test_validate(test, bridge1 != NULL); CREATE_ALICE_CHANNEL(chan_alice, &alice_caller); @@ -1332,7 +1333,8 @@ AST_TEST_DEFINE(test_cel_attended_transfer_bridges_merge) /* Create second set of bridged parties */ bridge2 = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE | AST_BRIDGE_CAPABILITY_MULTIMIX, - AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART); + AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART, + "test_cel", "test_cel_atxfer_bridges_merge_2"); ast_test_validate(test, bridge2 != NULL); CREATE_DAVID_CHANNEL(chan_david, &david_caller); @@ -1400,7 +1402,8 @@ AST_TEST_DEFINE(test_cel_attended_transfer_bridges_link) bridge1 = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE | AST_BRIDGE_CAPABILITY_MULTIMIX, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_TO | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM - | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART); + | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART, + "test_cel", "test_cel_atxfer_bridges_link_1"); ast_test_validate(test, bridge1 != NULL); CREATE_ALICE_CHANNEL(chan_alice, &alice_caller); @@ -1415,7 +1418,8 @@ AST_TEST_DEFINE(test_cel_attended_transfer_bridges_link) bridge2 = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE | AST_BRIDGE_CAPABILITY_MULTIMIX, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_TO | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM - | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART); + | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_SMART, + "test_cel", "test_cel_atxfer_bridges_link_2"); ast_test_validate(test, bridge2 != NULL); CREATE_DAVID_CHANNEL(chan_david, &david_caller); -- GitLab