From 9b87fa23c7836284f1945f620a105573471af0a1 Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 12 Jul 2011 15:38:47 +0000 Subject: [PATCH] Merged revisions 327793 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r327793 | tilghman | 2011-07-12 10:35:46 -0500 (Tue, 12 Jul 2011) | 14 lines Use 'printf' (POSIX issue 4) instead of 'echo -n', for portability. The problem with using 'echo -n' is that it is not portable. While BSD systems required that the '-n' option be removed and interpreted, System V required that all strings should be echoed with no interpretation of options. This fundamental difference of behavior means that it is never possible to use the '-n' flag to echo in tests which are meant to be portable. In this case, on Mac OS X 10.6, the /bin/sh shell builtin 'echo' uses the System V semantics of the command, and thus the SHELL test failed on that platform. http://pubs.opengroup.org/onlinepubs/009695399/utilities/echo.html#tag_04_41_16 ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@327794 f38db490-d61c-443f-a65b-d21fe96a405b --- tests/test_substitution.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_substitution.c b/tests/test_substitution.c index b335d50ba..cb3161691 100644 --- a/tests/test_substitution.c +++ b/tests/test_substitution.c @@ -261,8 +261,8 @@ AST_TEST_DEFINE(test_substitution) TEST(test_expected_result(test, c, "A${${baz}o:-2:-1}A", "A2A")); pbx_builtin_setvar_helper(c, "list1", "ab&cd&ef"); TEST(test_expected_result(test, c, "${LISTFILTER(list1,&,cd)}", "ab&ef")); - TEST(test_expected_result(test, c, "${SHELL(printf 123)},${SHELL(printf 456)}", "123,456")); - TEST(test_expected_result(test, c, "${foo},${CDR(answer)},${SHELL(printf 456)}", "123,,456")); + TEST(test_expected_result(test, c, "${SHELL(printf '%d' 123)},${SHELL(printf '%d' 456)}", "123,456")); + TEST(test_expected_result(test, c, "${foo},${CDR(answer)},${SHELL(printf '%d' 456)}", "123,,456")); TEST(test_expected_result(test, c, "${foo},${this_does_not_exist},${THIS_DOES_NOT_EXIST(either)}", "123,,")); #undef TEST