From: Ralf Wildenhues Date: Mon, 21 Mar 2011 21:12:07 +0000 (+0100) Subject: tests: fix unindent to use printf not echo for script. X-Git-Tag: v1.11.1b~31^2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32975c638af3628283ba0fe6080729acbc898acb;p=thirdparty%2Fautomake.git tests: fix unindent to use printf not echo for script. * tests/defs.in: Use printf rather than echo, as the latter may interpret the backslashes in the sed script. Fixes test failures with dash as /bin/sh. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 6f67d36cf..18977a948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-03-21 Ralf Wildenhues + + tests: fix unindent to use printf not echo for script. + * tests/defs.in: Use printf rather than echo, as the latter may + interpret the backslashes in the sed script. Fixes test + failures with dash as /bin/sh. + 2011-03-01 Peter Rosin test defs: unindent without temporary file diff --git a/tests/defs.in b/tests/defs.in index 2685112ed..fb57dfd38 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -464,7 +464,7 @@ commented_sed_unindent_prog=' unindent () { if test x"$sed_unindent_prog" = x; then - sed_unindent_prog=`echo "$commented_sed_unindent_prog" | sed -e "s/ *# .*//"` + sed_unindent_prog=`printf '%s\n' "$commented_sed_unindent_prog" | sed -e "s/ *# .*//"` fi sed "$sed_unindent_prog" ${1+"$@"} }