| Message ID | 20190225131450.4775-1-juergh@canonical.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND] selftests/ftrace: Handle the absence of tput | expand |
On 2/25/19 6:14 AM, Juerg Haefliger wrote: > In environments where tput is not available, we get the following > error > $ ./ftracetest: 163: [: Illegal number: > because ncolors is an empty string. Fix that by setting it to 0 if the > tput command fails. > > 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 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest > index 75244db70331..fc755e1b50f1 100755 > --- a/tools/testing/selftests/ftrace/ftracetest > +++ b/tools/testing/selftests/ftrace/ftracetest > @@ -154,13 +154,13 @@ fi > > # Define text colors > # Check available colors on the terminal, if any > -ncolors=`tput colors 2>/dev/null` > +ncolors=`tput colors 2>/dev/null || echo 0` > color_reset= > color_red= > color_green= > color_blue= > # If stdout exists and number of colors is eight or more, use them > -if [ -t 1 -a "$ncolors" -a "$ncolors" -ge 8 ]; then > +if [ -t 1 -a "$ncolors" -ge 8 ]; then > color_reset="\e[0m" > color_red="\e[31m" > color_green="\e[32m" > Juerg! Thanks for the resend. Applied to linux-kselftest next for 5.1-rc1. Since I applied this patch out of order, I had to resolve minor merge conflict. Please review. thanks, -- Shuah
On Mon, 25 Feb 2019 07:51:13 -0700 shuah <shuah@kernel.org> wrote: > On 2/25/19 6:14 AM, Juerg Haefliger wrote: > > In environments where tput is not available, we get the following > > error > > $ ./ftracetest: 163: [: Illegal number: > > because ncolors is an empty string. Fix that by setting it to 0 if the > > tput command fails. > > > > 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 | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest > > index 75244db70331..fc755e1b50f1 100755 > > --- a/tools/testing/selftests/ftrace/ftracetest > > +++ b/tools/testing/selftests/ftrace/ftracetest > > @@ -154,13 +154,13 @@ fi > > > > # Define text colors > > # Check available colors on the terminal, if any > > -ncolors=`tput colors 2>/dev/null` > > +ncolors=`tput colors 2>/dev/null || echo 0` > > color_reset= > > color_red= > > color_green= > > color_blue= > > # If stdout exists and number of colors is eight or more, use them > > -if [ -t 1 -a "$ncolors" -a "$ncolors" -ge 8 ]; then > > +if [ -t 1 -a "$ncolors" -ge 8 ]; then > > color_reset="\e[0m" > > color_red="\e[31m" > > color_green="\e[32m" > > > > Juerg! > > Thanks for the resend. Applied to linux-kselftest next for 5.1-rc1. > > Since I applied this patch out of order, I had to resolve minor merge > conflict. Please review. Looks good. Thanks Shuah! ..Juerg > thanks, > -- Shuah
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index 75244db70331..fc755e1b50f1 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -154,13 +154,13 @@ fi # Define text colors # Check available colors on the terminal, if any -ncolors=`tput colors 2>/dev/null` +ncolors=`tput colors 2>/dev/null || echo 0` color_reset= color_red= color_green= color_blue= # If stdout exists and number of colors is eight or more, use them -if [ -t 1 -a "$ncolors" -a "$ncolors" -ge 8 ]; then +if [ -t 1 -a "$ncolors" -ge 8 ]; then color_reset="\e[0m" color_red="\e[31m" color_green="\e[32m"