aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-28 18:20:20 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-28 18:20:20 +0000
commitfbff1f94909d66a96e1308afa3e7ef3d8f99669c (patch)
tree80312d731b5d271b32891813eb236cb07975c542 /tests
parente2cfdefadbfd7789c6fa38cc053554a46f1e26ae (diff)
Merged revisions 289104 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r289104 | tilghman | 2010-09-28 13:18:43 -0500 (Tue, 28 Sep 2010) | 4 lines Solaris compatibility fixes Review: https://reviewboard.asterisk.org/r/942/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@289112 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'tests')
-rw-r--r--tests/test_time.c1
-rw-r--r--tests/test_utils.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/test_time.c b/tests/test_time.c
index 0fc778526..0fca0fd55 100644
--- a/tests/test_time.c
+++ b/tests/test_time.c
@@ -82,6 +82,7 @@ AST_TEST_DEFINE(test_timezone_watch)
ast_log(LOG_WARNING, "system(%s) returned non-zero: %d\n", syscmd, system_res);
}
ast_localtime_wakeup_monitor();
+ sched_yield();
ast_localtime(&tv, &atm[i], tzfile);
if (i != 0) {
if (atm[i].tm_hour == atm[i - 1].tm_hour) {
diff --git a/tests/test_utils.c b/tests/test_utils.c
index b6ff32455..ceeb57c3e 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -253,6 +253,7 @@ AST_TEST_DEFINE(crypto_loaded_test)
break;
}
+#if 0 /* Not defined on Solaris */
ast_test_status_update(test,
"address of __stub__ast_crypto_loaded is %p\n",
__stub__ast_crypto_loaded);
@@ -264,6 +265,7 @@ AST_TEST_DEFINE(crypto_loaded_test)
ast_test_status_update(test,
"pointer to ast_crypto_loaded is %p\n",
ast_crypto_loaded);
+#endif
return ast_crypto_loaded() ? AST_TEST_PASS : AST_TEST_FAIL;
}
@@ -308,6 +310,7 @@ AST_TEST_DEFINE(agi_loaded_test)
break;
}
+#if 0
ast_test_status_update(test,
"address of __stub__ast_agi_register is %p\n",
__stub__ast_agi_register);
@@ -319,6 +322,7 @@ AST_TEST_DEFINE(agi_loaded_test)
ast_test_status_update(test,
"pointer to ast_agi_register is %p\n",
ast_agi_register);
+#endif
if (ast_agi_register(ast_module_info->self, &noop_command) == AST_OPTIONAL_API_UNAVAILABLE) {
return AST_TEST_FAIL;