diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-30 20:40:08 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-30 20:40:08 +0000 |
| commit | 6d0e38332157bad2ad3c3667cd80c214e47fb83a (patch) | |
| tree | fa98c6c19dbadcf2986ba059b1d090a07d8b1044 /tests/test_time.c | |
| parent | 72fbcfd95d3f10f3ce78282760856e7b3ce7f48d (diff) | |
Merged revisions 289543,289581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r289543 | tilghman | 2010-09-30 12:50:52 -0500 (Thu, 30 Sep 2010) | 2 lines
More Solaris compatibility fixes
........
r289581 | tilghman | 2010-09-30 15:23:10 -0500 (Thu, 30 Sep 2010) | 2 lines
Solaris fixes.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_time.c')
| -rw-r--r-- | tests/test_time.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/test_time.c b/tests/test_time.c index 0fca0fd55..c81c9bb12 100644 --- a/tests/test_time.c +++ b/tests/test_time.c @@ -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) { |