Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix build warnings with TEST_FRAMEWORK enabled

Browse Source 
........

Merged revisions 416732 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@416733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/61/61/1
Kinsey Moore 11 years ago
parent 874be8b530
commit b583f708cb
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
channels/sip/reqresp_parser.c
Unescape View File

@ -2489,8 +2489,8 @@ AST_TEST_DEFINE(parse_via_test)
if (testdataptr->expected_port && testdataptr->expected_port != via->port) { if (testdataptr->expected_port && testdataptr->expected_port != via->port) {
ast_test_status_update(test, "TEST#%d FAILED: VIA = \"%s\"\n" ast_test_status_update(test, "TEST#%d FAILED: VIA = \"%s\"\n"
"parsed port = \"%d\"\n" "parsed port = \"%u\"\n"
"expected = \"%d\"\n" "expected = \"%u\"\n"
"failed to parse port\n", "failed to parse port\n",
i, testdataptr->in, via->port, testdataptr->expected_port); i, testdataptr->in, via->port, testdataptr->expected_port);
res = AST_TEST_FAIL; res = AST_TEST_FAIL;

4
main/bridging.c
Unescape View File

@ -1540,7 +1540,7 @@ void ast_bridge_set_single_src_video_mode(struct ast_bridge *bridge, struct ast_
cleanup_video_mode(bridge); cleanup_video_mode(bridge);
bridge->video_mode.mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC; bridge->video_mode.mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC;
bridge->video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan); bridge->video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan);
ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to single source\r\nVideo Mode: %d\r\nVideo Channel: %s", bridge->video_mode.mode, ast_channel_name(video_src_chan)); ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to single source\r\nVideo Mode: %u\r\nVideo Channel: %s", bridge->video_mode.mode, ast_channel_name(video_src_chan));
ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE); ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);
ao2_unlock(bridge); ao2_unlock(bridge);
} }
@ -1550,7 +1550,7 @@ void ast_bridge_set_talker_src_video_mode(struct ast_bridge *bridge)
ao2_lock(bridge); ao2_lock(bridge);
cleanup_video_mode(bridge); cleanup_video_mode(bridge);
bridge->video_mode.mode = AST_BRIDGE_VIDEO_MODE_TALKER_SRC; bridge->video_mode.mode = AST_BRIDGE_VIDEO_MODE_TALKER_SRC;
ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to talker source\r\nVideo Mode: %d", bridge->video_mode.mode); ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to talker source\r\nVideo Mode: %u", bridge->video_mode.mode);
ao2_unlock(bridge); ao2_unlock(bridge);
} }

10
main/logger.c
Unescape View File

@ -1327,7 +1327,7 @@ struct ast_callid *ast_create_callid(void)
call->call_identifier = ast_atomic_fetchadd_int(&next_unique_callid, +1); call->call_identifier = ast_atomic_fetchadd_int(&next_unique_callid, +1);
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", call->call_identifier); ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", (unsigned)call->call_identifier);
#endif #endif
return call; return call;
} }
@ -1357,7 +1357,7 @@ int ast_callid_threadassoc_change(struct ast_callid *callid)
if (*id && (*id != callid)) { if (*id && (*id != callid)) {
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
ast_debug(3, "CALL_ID [C-%08x] being removed from thread.\n", (*id)->call_identifier); ast_debug(3, "CALL_ID [C-%08x] being removed from thread.\n", (unsigned)(*id)->call_identifier);
#endif #endif
*id = ast_callid_unref(*id); *id = ast_callid_unref(*id);
*id = NULL; *id = NULL;
@ -1368,7 +1368,7 @@ int ast_callid_threadassoc_change(struct ast_callid *callid)
ast_callid_ref(callid); ast_callid_ref(callid);
*id = callid; *id = callid;
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid->call_identifier); ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", (unsigned)callid->call_identifier);
#endif #endif
} }
@ -1390,7 +1390,7 @@ int ast_callid_threadassoc_add(struct ast_callid *callid)
ast_callid_ref(callid); ast_callid_ref(callid);
*pointing = callid; *pointing = callid;
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid->call_identifier); ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", (unsigned)callid->call_identifier);
#endif #endif
} else { } else {
ast_log(LOG_WARNING, "Attempted to ast_callid_threadassoc_add on thread already associated with a callid.\n"); ast_log(LOG_WARNING, "Attempted to ast_callid_threadassoc_add on thread already associated with a callid.\n");
@ -1415,7 +1415,7 @@ int ast_callid_threadassoc_remove(void)
return -1; return -1;
} else { } else {
#ifdef TEST_FRAMEWORK #ifdef TEST_FRAMEWORK
ast_debug(3, "Call_ID [C-%08x] being removed from thread.\n", (*pointing)->call_identifier); ast_debug(3, "Call_ID [C-%08x] being removed from thread.\n", (unsigned)(*pointing)->call_identifier);
#endif #endif
*pointing = ast_callid_unref(*pointing); *pointing = ast_callid_unref(*pointing);
return 0; return 0;

20
main/test.c
Unescape View File

@ -185,7 +185,7 @@ static void test_xml_entry(struct ast_test *test, FILE *f)
return; return;
} }
fprintf(f, "\t<testcase time=\"%d.%d\" name=\"%s%s\"%s>\n", fprintf(f, "\t<testcase time=\"%u.%u\" name=\"%s%s\"%s>\n",
test->time / 1000, test->time % 1000, test->time / 1000, test->time % 1000,
test->info.category, test->info.name, test->info.category, test->info.name,
test->state == AST_TEST_PASS ? "/" : ""); test->state == AST_TEST_PASS ? "/" : "");
@ -210,7 +210,7 @@ static void test_txt_entry(struct ast_test *test, FILE *f)
fprintf(f, "Description: %s\n", test->info.description); fprintf(f, "Description: %s\n", test->info.description);
fprintf(f, "Result: %s\n", test_result2str[test->state]); fprintf(f, "Result: %s\n", test_result2str[test->state]);
if (test->state != AST_TEST_NOT_RUN) { if (test->state != AST_TEST_NOT_RUN) {
fprintf(f, "Time: %d\n", test->time); fprintf(f, "Time: %u\n", test->time);
} }
if (test->state == AST_TEST_FAIL) { if (test->state == AST_TEST_FAIL) {
fprintf(f, "Error Description: %s\n\n", S_OR(ast_str_buffer(test->status_str), "NA")); fprintf(f, "Error Description: %s\n\n", S_OR(ast_str_buffer(test->status_str), "NA"));
@ -296,7 +296,7 @@ static int test_execute_multiple(const char *name, const char *category, struct
(test->state == AST_TEST_FAIL) ? COLOR_RED : COLOR_GREEN, (test->state == AST_TEST_FAIL) ? COLOR_RED : COLOR_GREEN,
0, 0,
sizeof(result_buf)); sizeof(result_buf));
ast_cli(cli->fd, "END %s - %s Time: %s%dms Result: %s\n", ast_cli(cli->fd, "END %s - %s Time: %s%ums Result: %s\n",
test->info.category, test->info.category,
test->info.name, test->info.name,
test->time ? "" : "<", test->time ? "" : "<",
@ -385,7 +385,7 @@ static int test_generate_results(const char *name, const char *category, const c
* http://confluence.atlassian.com/display/BAMBOO/JUnit+parsing+in+Bamboo * http://confluence.atlassian.com/display/BAMBOO/JUnit+parsing+in+Bamboo
*/ */
fprintf(f_xml, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); fprintf(f_xml, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
fprintf(f_xml, "<testsuite errors=\"0\" time=\"%d.%d\" tests=\"%d\" " fprintf(f_xml, "<testsuite errors=\"0\" time=\"%u.%u\" tests=\"%u\" "
"name=\"AsteriskUnitTests\">\n", "name=\"AsteriskUnitTests\">\n",
last_results.total_time / 1000, last_results.total_time % 1000, last_results.total_time / 1000, last_results.total_time % 1000,
last_results.total_tests); last_results.total_tests);
@ -398,11 +398,11 @@ static int test_generate_results(const char *name, const char *category, const c
if (f_txt) { if (f_txt) {
fprintf(f_txt, "Asterisk Version: %s\n", ast_get_version()); fprintf(f_txt, "Asterisk Version: %s\n", ast_get_version());
fprintf(f_txt, "Asterisk Version Number: %s\n", ast_get_version_num()); fprintf(f_txt, "Asterisk Version Number: %s\n", ast_get_version_num());
fprintf(f_txt, "Number of Tests: %d\n", last_results.total_tests); fprintf(f_txt, "Number of Tests: %u\n", last_results.total_tests);
fprintf(f_txt, "Number of Tests Executed: %d\n", (last_results.total_passed + last_results.total_failed)); fprintf(f_txt, "Number of Tests Executed: %u\n", (last_results.total_passed + last_results.total_failed));
fprintf(f_txt, "Passed Tests: %d\n", last_results.total_passed); fprintf(f_txt, "Passed Tests: %u\n", last_results.total_passed);
fprintf(f_txt, "Failed Tests: %d\n", last_results.total_failed); fprintf(f_txt, "Failed Tests: %u\n", last_results.total_failed);
fprintf(f_txt, "Total Execution Time: %d\n", last_results.total_time); fprintf(f_txt, "Total Execution Time: %u\n", last_results.total_time);
} }
/* export each individual test */ /* export each individual test */
@ -728,7 +728,7 @@ static char *test_cli_execute_registered(struct ast_cli_entry *e, int cmd, struc
if (!(last_results.last_passed + last_results.last_failed)) { if (!(last_results.last_passed + last_results.last_failed)) {
ast_cli(a->fd, "--- No Tests Found! ---\n"); ast_cli(a->fd, "--- No Tests Found! ---\n");
} }
ast_cli(a->fd, "\n%d Test(s) Executed %d Passed %d Failed\n", ast_cli(a->fd, "\n%u Test(s) Executed %u Passed %u Failed\n",
(last_results.last_passed + last_results.last_failed), (last_results.last_passed + last_results.last_failed),
last_results.last_passed, last_results.last_passed,
last_results.last_failed); last_results.last_failed);

Write Preview
Loading…
Cancel
Save