tests/shell: honor CLICOLOR_FORCE to force coloring in run-tests.sh

We honor NO_COLOR= to disable coloring, let's also honor CLICOLOR_FORCE=
to enable it.

The purpose will be for `make` calling the script and redirecting to a
file, while enabling colors.

See-also: https://bixense.com/clicolors/

Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh
index 9114eba289afcbe26935fec4bce15785bd2d2125..c5d6307d067e2d7fef209c5b05750f1673893d8a 100755 (executable)
--- a/tests/shell/run-tests.sh
+++ b/tests/shell/run-tests.sh
@@ -4,11 +4,16 @@ GREEN=""
 YELLOW=""
 RED=""
 RESET=""
-if [[ -t 1 && -z "$NO_COLOR" ]] ; then
-       GREEN=$'\e[32m'
-       YELLOW=$'\e[33m'
-       RED=$'\e[31m'
-       RESET=$'\e[0m'
+if [ -z "$NO_COLOR" ] ; then
+       if [ -n "$CLICOLOR_FORCE" ] || [[ -t 1 ]] ; then
+               # See https://bixense.com/clicolors/ . We only check isatty() on
+               # file descriptor 1, to decide whether colorizing happens (although,
+               # we might also colorize on other places/FDs).
+               GREEN=$'\e[32m'
+               YELLOW=$'\e[33m'
+               RED=$'\e[31m'
+               RESET=$'\e[0m'
+       fi
 fi
 
 array_contains() {