From d0607f4d52db1b684e2d4c3f89acd63032790595 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 30 Sep 2010 20:40:08 +0000
Subject: 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: http://svn.digium.com/svn/asterisk/trunk@289588 f38db490-d61c-443f-a65b-d21fe96a405b
---
 tests/test_time.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'tests/test_time.c')

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) {
-- 
cgit v1.2.3