kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 14:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Solaris compatibility fixes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@289543 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-09-30 17:50:52 +00:00
parent 37ad96f682
commit f48a6f6cfe
5 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_time.c
View File

@@ -73,7 +73,13 @@ AST_TEST_DEFINE(test_timezone_watch)
}
snprintf(tzfile, sizeof(tzfile), "%s/test", tmpdir);
for (type = 0; type < 2; type++) {
for (type = 0; type <
#ifdef SOLARIS
1 /* Solaris doesn't use symlinks for timezones */
#else
2
#endif
; type++) {
ast_test_status_update(test, "Executing %s test...\n", type == 0 ? "deletion" : "symlink");
for (i = 0; i < ARRAY_LEN(zones); i++) {
int system_res;
@@ -81,8 +87,8 @@ AST_TEST_DEFINE(test_timezone_watch)
if ((system_res = ast_safe_system(syscmd))) {
ast_log(LOG_WARNING, "system(%s) returned non-zero: %d\n", syscmd, system_res);
}
ast_localtime_wakeup_monitor();
sched_yield();
ast_localtime_wakeup_monitor(test);
ast_test_status_update(test, "Querying timezone %s\n", tzfile);
ast_localtime(&tv, &atm[i], tzfile);
if (i != 0) {
if (atm[i].tm_hour == atm[i - 1].tm_hour) {

3
tests/test_utils.c
View File

@@ -325,15 +325,18 @@ AST_TEST_DEFINE(agi_loaded_test)
#endif
if (ast_agi_register(ast_module_info->self, &noop_command) == AST_OPTIONAL_API_UNAVAILABLE) {
ast_test_status_update(test, "Unable to register testnoop command, because res_agi is not loaded.\n");
return AST_TEST_FAIL;
}
#ifndef HAVE_NULLSAFE_PRINTF
/* Test for condition without actually crashing Asterisk */
if (noop_command.usage == NULL) {
ast_test_status_update(test, "AGI testnoop usage was not updated properly.\n");
res = AST_TEST_FAIL;
}
if (noop_command.syntax == NULL) {
ast_test_status_update(test, "AGI testnoop syntax was not updated properly.\n");
res = AST_TEST_FAIL;
}
#endif