| Message ID | 20190222205351.743-2-juergh@canonical.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND,v2,1/2] selftests/ftrace: Replace echo -e with printf | expand |
On 2/22/19 1:53 PM, Juerg Haefliger wrote: > echo -e is not POSIX. Depending on what /bin/sh is, we can get > incorrect output like: > $ -e -n [1] Basic trace file check > $ -e [PASS] > > Fix that by using printf instead. > > Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> > Acked-by: Masami Hiramatsu <mhiramat@kernel.org> > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > tools/testing/selftests/ftrace/ftracetest | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest > index fc755e1b50f1..20c9c0ad8682 100755 > --- a/tools/testing/selftests/ftrace/ftracetest > +++ b/tools/testing/selftests/ftrace/ftracetest > @@ -173,8 +173,13 @@ strip_esc() { > } > > prlog() { # messages > - echo -e "$@" > - [ "$LOG_FILE" ] && echo -e "$@" | strip_esc >> $LOG_FILE > + newline="\n" > + if [ "$1" = "-n" ] ; then > + newline= > + shift > + fi > + printf "$*$newline" > + [ "$LOG_FILE" ] && printf "$*$newline" | strip_esc >> $LOG_FILE > } > catlog() { #file > cat $1 > This patch applied to linux-kselftest next which is at 5.0rc6 I queued this for 5.1-rc1. thanks, -- Shuah
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index fc755e1b50f1..20c9c0ad8682 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -173,8 +173,13 @@ strip_esc() { } prlog() { # messages - echo -e "$@" - [ "$LOG_FILE" ] && echo -e "$@" | strip_esc >> $LOG_FILE + newline="\n" + if [ "$1" = "-n" ] ; then + newline= + shift + fi + printf "$*$newline" + [ "$LOG_FILE" ] && printf "$*$newline" | strip_esc >> $LOG_FILE } catlog() { #file cat $1