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

Fix build in dev/TEST_FRAMEWORK mode

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.28@421208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/98/198/1
Kinsey Moore 11 years ago
parent ad8dfa0a55
commit ec7bb2af25
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

8
apps/app_meetme.c
Unescape View File

@ -2825,7 +2825,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
if (ast_test_flag64(confflags, CONFFLAG_DURATION_STOP) && !ast_strlen_zero(optargs[OPT_ARG_DURATION_STOP])) {
calldurationlimit = atoi(optargs[OPT_ARG_DURATION_STOP]);
ast_verb(3, "Setting call duration limit to %d seconds.\n", calldurationlimit);
ast_verb(3, "Setting call duration limit to %u seconds.\n", calldurationlimit);
}
if (ast_test_flag64(confflags, CONFFLAG_DURATION_LIMIT) && !ast_strlen_zero(optargs[OPT_ARG_DURATION_LIMIT])) {
@ -3863,12 +3863,12 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
break;
default:
ast_debug(1,
"Got ignored control frame on channel %s, f->frametype=%d,f->subclass=%d\n",
"Got ignored control frame on channel %s, f->frametype=%u,f->subclass=%d\n",
chan->name, f->frametype, f->subclass.integer);
}
} else {
ast_debug(1,
"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",
"Got unrecognized frame on channel %s, f->frametype=%u,f->subclass=%d\n",
chan->name, f->frametype, f->subclass.integer);
}
ast_frfree(f);
@ -6639,7 +6639,7 @@ static int sla_station_exec(struct ast_channel *chan, const char *data)
ast_cond_destroy(&cond);
ast_autoservice_stop(chan);
if (!trunk_ref->trunk->chan) {
ast_debug(1, "Trunk didn't get created. chan: %lx\n", (long) trunk_ref->trunk->chan);
ast_debug(1, "Trunk didn't get created. chan: %lx\n", (unsigned long) trunk_ref->trunk->chan);
pbx_builtin_setvar_helper(chan, "SLASTATION_STATUS", "CONGESTION");
sla_change_trunk_state(trunk_ref->trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL);
trunk_ref->chan = NULL;

4
apps/app_voicemail.c
Unescape View File

@ -14263,8 +14263,8 @@ static int vm_test_destroy_user(const char *context, const char *mailbox)
AST_LIST_LOCK(&users);
AST_LIST_TRAVERSE_SAFE_BEGIN(&users, vmu, list) {
if (!strncmp(context, vmu->context, sizeof(context))
&& !strncmp(mailbox, vmu->mailbox, sizeof(mailbox))) {
if (!strcmp(context, vmu->context)
&& !strcmp(mailbox, vmu->mailbox)) {
AST_LIST_REMOVE_CURRENT(list);
ast_free(vmu);
break;

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) {
ast_test_status_update(test, "TEST#%d FAILED: VIA = \"%s\"\n"
"parsed port = \"%d\"\n"
"expected = \"%d\"\n"
"parsed port = \"%u\"\n"
"expected = \"%u\"\n"
"failed to parse port\n",
i, testdataptr->in, via->port, testdataptr->expected_port);
res = AST_TEST_FAIL;

20
main/test.c
Unescape View File

@ -185,7 +185,7 @@ static void test_xml_entry(struct ast_test *test, FILE *f)
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->info.category, test->info.name,
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, "Result: %s\n", test_result2str[test->state]);
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) {
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,
0,
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.name,
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
*/
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",
last_results.total_time / 1000, last_results.total_time % 1000,
last_results.total_tests);
@ -398,11 +398,11 @@ static int test_generate_results(const char *name, const char *category, const c
if (f_txt) {
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, "Number of Tests: %d\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, "Passed Tests: %d\n", last_results.total_passed);
fprintf(f_txt, "Failed Tests: %d\n", last_results.total_failed);
fprintf(f_txt, "Total Execution Time: %d\n", last_results.total_time);
fprintf(f_txt, "Number of Tests: %u\n", last_results.total_tests);
fprintf(f_txt, "Number of Tests Executed: %u\n", (last_results.total_passed + last_results.total_failed));
fprintf(f_txt, "Passed Tests: %u\n", last_results.total_passed);
fprintf(f_txt, "Failed Tests: %u\n", last_results.total_failed);
fprintf(f_txt, "Total Execution Time: %u\n", last_results.total_time);
}
/* 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)) {
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);

Write Preview
Loading…
Cancel
Save