From: Carl Worth <cworth@cworth.org>
Date: Mon, 18 Aug 2014 23:26:09 +0000 (-0700)
Subject: glcpp: Use printf instead of "echo -n" in glcpp-test
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c09a8b0e3bb93906f59fee565eb22d37b91fbfaf;p=mesa.git

glcpp: Use printf instead of "echo -n" in glcpp-test

I noticed that with /bin/sh on Mac OS X, "echo -n" does not work as
desired, (it actually prints "-n" rather than suppressing the final
newline). There is a /bin/echo that could be used (it actually works)
instead of the builtin echo.

But I decided it's more robust to just use printf rather than
hardcoding /bin/echo into the script.
---

diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test
index 640f57684ff..ea69edfd8b0 100755
--- a/src/glsl/glcpp/tests/glcpp-test
+++ b/src/glsl/glcpp/tests/glcpp-test
@@ -59,7 +59,7 @@ clean=0
 
 echo "====== Testing for correctness ======"
 for test in $testdir/*.c; do
-    echo -n "Testing $test..."
+    printf "Testing $test..."
     $glcpp $(test_specific_args $test) < $test > $test.out 2>&1
     total=$((total+1))
     if cmp $test.expected $test.out >/dev/null 2>&1; then
@@ -78,7 +78,7 @@ echo ""
 if [ "$do_valgrind" = "yes" ]; then
     echo "====== Testing for valgrind cleanliness ======"
     for test in $testdir/*.c; do
-	echo -n "Testing $test with valgrind..."
+	printf "Testing $test with valgrind..."
 	valgrind --error-exitcode=31 --log-file=$test.valgrind-errors $glcpp $(test_specific_args $test) < $test >/dev/null 2>&1
 	if [ "$?" = "31" ]; then
 	    echo "ERRORS"