[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190225131450.4775-1-juergh@canonical.com>
Date: Mon, 25 Feb 2019 14:14:50 +0100
From: Juerg Haefliger <juerg.haefliger@...onical.com>
To: rostedt@...dmis.org, mingo@...hat.com, shuah@...nel.org,
linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Juerg Haefliger <juergh@...onical.com>
Subject: [RESEND PATCH] selftests/ftrace: Handle the absence of tput
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"
--
2.19.1
Powered by blists - more mailing lists