From b4f89b608acfdaafb3c14d753a5055ca9f291182 Mon Sep 17 00:00:00 2001
From: Dave Hart <hart@ntp.org>
Date: Tue, 1 Feb 2011 01:15:48 -0500
Subject: [PATCH] Fix test.sh output on solaris

Solaris echo -n doesn't omit newlines, but printf omits newlines in
more places.
---
 test/test.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/test.sh b/test/test.sh
index 48deb9b1..0054faee 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -7,12 +7,18 @@ then
 	TEST_OUTPUT_FILE=/dev/null
 fi
 
-# /bin/echo is a little more likely to support -n than sh's builtin echo.
-if test -x /bin/echo
+# /bin/echo is a little more likely to support -n than sh's builtin echo,
+# printf is even more likely
+if test "`printf hello 2>&1`" = "hello"
 then
-	ECHO=/bin/echo
+	ECHO_N="printf"
 else
-	ECHO=echo
+	if test -x /bin/echo
+	then
+		ECHO_N="/bin/echo -n"
+	else
+		ECHO_N="echo -n"
+	fi
 fi
 
 if test "$TEST_OUTPUT_FILE" != "/dev/null"
@@ -45,7 +51,7 @@ announce () {
 }
 
 announce_n () {
-	$ECHO -n "$@"
+	$ECHO_N "$@"
 	echo "$@" >>"$TEST_OUTPUT_FILE"
 }