Add shuah@kernel.org and linux-kselftest@vger.kernel.org.
The recent addition of colored output introduced some non-POSIX-compliant constructs. Fix that.
Juerg Haefliger (2): selftests/ftrace: Replace echo -e with printf selftests/ftrace: Replace \e with \033
tools/testing/selftests/ftrace/ftracetest | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
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
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
The \e sequence character is not POSIX. Fix that by using \033 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index 20c9c0ad8682..136387422b00 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -161,10 +161,10 @@ color_green= color_blue= # If stdout exists and number of colors is eight or more, use them if [ -t 1 -a "$ncolors" -ge 8 ]; then - color_reset="\e[0m" - color_red="\e[31m" - color_green="\e[32m" - color_blue="\e[34m" + color_reset="\033[0m" + color_red="\033[31m" + color_green="\033[32m" + color_blue="\033[34m" fi
strip_esc() {
On 2/22/19 1:53 PM, Juerg Haefliger wrote:
The \e sequence character is not POSIX. Fix that by using \033 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index 20c9c0ad8682..136387422b00 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -161,10 +161,10 @@ color_green= color_blue= # If stdout exists and number of colors is eight or more, use them if [ -t 1 -a "$ncolors" -ge 8 ]; then
- color_reset="\e[0m"
- color_red="\e[31m"
- color_green="\e[32m"
- color_blue="\e[34m"
- color_reset="\033[0m"
- color_red="\033[31m"
- color_green="\033[32m"
- color_blue="\033[34m" fi
strip_esc() {
Which release is this patch based on?
This one failed to apply to linux-kselftest next - I resolved a minor merge conflict and applied it. Please review to make sure it looks good.
thanks, -- Shuah
On Fri, 22 Feb 2019 15:46:03 -0700 shuah shuah@kernel.org wrote:
On 2/22/19 1:53 PM, Juerg Haefliger wrote:
The \e sequence character is not POSIX. Fix that by using \033 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index 20c9c0ad8682..136387422b00 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -161,10 +161,10 @@ color_green= color_blue= # If stdout exists and number of colors is eight or more, use them if [ -t 1 -a "$ncolors" -ge 8 ]; then
- color_reset="\e[0m"
- color_red="\e[31m"
- color_green="\e[32m"
- color_blue="\e[34m"
- color_reset="\033[0m"
- color_red="\033[31m"
- color_green="\033[32m"
- color_blue="\033[34m" fi
strip_esc() {
Which release is this patch based on?
This one failed to apply to linux-kselftest next - I resolved a minor merge conflict and applied it. Please review to make sure it looks good.
Looks good. It didn't apply cleanly because you don't have https://lore.kernel.org/lkml/20190220153706.24686-1-juergh@canonical.com/T/#... Sorry about not copying you on that patch. Want me to resend?
...Juerg
thanks, -- Shuah
On 2/23/19 5:25 AM, Juerg Haefliger wrote:
On Fri, 22 Feb 2019 15:46:03 -0700 shuah shuah@kernel.org wrote:
On 2/22/19 1:53 PM, Juerg Haefliger wrote:
The \e sequence character is not POSIX. Fix that by using \033 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index 20c9c0ad8682..136387422b00 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -161,10 +161,10 @@ color_green= color_blue= # If stdout exists and number of colors is eight or more, use them if [ -t 1 -a "$ncolors" -ge 8 ]; then
- color_reset="\e[0m"
- color_red="\e[31m"
- color_green="\e[32m"
- color_blue="\e[34m"
- color_reset="\033[0m"
- color_red="\033[31m"
- color_green="\033[32m"
- color_blue="\033[34m" fi strip_esc() {
Which release is this patch based on?
This one failed to apply to linux-kselftest next - I resolved a minor merge conflict and applied it. Please review to make sure it looks good.
Looks good. It didn't apply cleanly because you don't have https://lore.kernel.org/lkml/20190220153706.24686-1-juergh@canonical.com/T/#... Sorry about not copying you on that patch. Want me to resend?
...Juerg
Yes. Please.
thanks, -- Shuah
linux-kselftest-mirror@lists.linaro.org
-
Juerg Haefliger -
shuah