diff options
| author | Carl Worth <[email protected]> | 2014-08-18 16:26:09 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2014-08-20 16:41:38 -0700 |
| commit | c09a8b0e3bb93906f59fee565eb22d37b91fbfaf (patch) | |
| tree | c2729a5cae3a2ccd2e37d8bd6cd9f57f48dcb907 | |
| parent | 04895f5c601b240df547739da786b7c2b65bdd1e (diff) | |
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.
| -rwxr-xr-x | src/glsl/glcpp/tests/glcpp-test | 4 |
1 files changed, 2 insertions, 2 deletions
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" |