linux-kernel - Re: [RESEND PATCH] selftests/ftrace: Handle the absence of tput

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <41adf479-e6e3-8233-4066-983d5e701177@kernel.org>
Date:   Mon, 25 Feb 2019 07:51:13 -0700
From:   shuah <shuah@...nel.org>
To:     Juerg Haefliger <juerg.haefliger@...onical.com>,
        rostedt@...dmis.org, mingo@...hat.com,
        linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Juerg Haefliger <juergh@...onical.com>, shuah <shuah@...nel.org>
Subject: Re: [RESEND PATCH] selftests/ftrace: Handle the absence of tput

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@...dmis.org>
> Acked-by: Masami Hiramatsu <mhiramat@...nel.org>
> Signed-off-by: Juerg Haefliger <juergh@...onical.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