color-tests: coloring can be forced on non-ANSI terminals as well

Before this change, colorization of testsuite output was suppressed
whenever the terminal was recognized to be a "dumb" one, incapable
of handling ANSI coloring (i.e., when the environment variable TERM
had a value of "dumb").  This happened even when the AM_COLOR_TESTS
variable was set to a value of "always".

Such a behaviour was suboptimal and slightly confusing; in fact, if
a user wants to force coloring of testsuite output that is being
redirected to a regular file, he should be able to do so even if his
terminal is not capable of handling ANSI colors -- in fact, such
terminal wouldn't be involved with the testsuite output in any way,
so why should it be allowed to influence it?

Thus, we now enable coloring of test output whenever AM_COLOR_TESTS
is set to "always", irrespective of the value of the TERM environment
variable.

* NEWS: Update.
* lib/am/check.am [%?COLOR%] (am__tty_colors): Activate colorization
of testsuite output whenever AM_COLOR_TESTS has the value of "always".
* t/ax/tap-summary-aux.sh: Export the TERM environment variable to
"dumb" when forcing colorization of the testsuite output; this should
*not* prevent such colorization from taking place, and we want to
check that this expectation really holds.
* t/ax/testsuite-summary-checks.sh: Likewise.
* t/color.sh: Likewise, and adjust some grepping checks.
* t/tap-color.sh: Likewise.  Also, remove redundant "make check"
invocation since we are at it.
* t/color2.sh: Likewise, and check that exporting TERM=dumb actually
prevents testsuite output colorization when AM_COLOR_TESTS is unset.
* t/parallel-tests-reset-term.sh: Relax, to prevent it from failing
spuriously due to the new semantic.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/NEWS b/NEWS
index b415be6779b0b741fa3e600aa42dd8b2829f886b..e8e59ced740b1d723a3f97732f3dca70ccaf5e1a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,15 @@ New in 1.12.1:
     m4 macro are deprecated, eliciting a warning in the 'obsolete'
     category.  They will be removed in the next major version (1.13).
 
+Bugs fixed in 1.12.1:
+
+* Long-standing bugs:
+
+  - When the 'color-tests' option is in use, forcing of colored testsuite
+    output through "AM_COLOR_TESTS=always" works even if the terminal is
+    a non-ANSI one, i.e., if the TERM environment variable has a value of
+    "dumb".
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.12:

diff --git a/lib/am/check.am b/lib/am/check.am
index 78665708d03f5ce6738405437de986241cba3968..73febb1b6d83200b4a910fb5cb31ec568e1d193d 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -18,23 +18,27 @@ am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
 if %?COLOR%
-# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
-# then this fails; a conservative approach.  Of course do not redirect
-# stdout here, just stderr.
-am__tty_colors = \
-$(am__tty_colors_dummy); \
-test "X$(AM_COLOR_TESTS)" != Xno \
-&& test "X$$TERM" != Xdumb \
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
-&& { \
-  am__color_tests=yes; \
-  red='\e[0;31m'; \
-  grn='\e[0;32m'; \
-  lgn='\e[1;32m'; \
-  blu='\e[1;34m'; \
-  mgn='\e[0;35m'; \
-  brg='\e[1m'; \
-  std='\e[m'; \
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+## If stdout is a non-dumb tty, use colors.  If test -t is not supported,
+## then this check fails; a conservative approach.  Of course do not
+## redirect stdout here, just stderr.
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='\e[0;31m'; \
+    grn='\e[0;32m'; \
+    lgn='\e[1;32m'; \
+    blu='\e[1;34m'; \
+    mgn='\e[0;35m'; \
+    brg='\e[1m'; \
+    std='\e[m'; \
+  fi; \
 }
 else !%?COLOR%
 am__tty_colors = $(am__tty_colors_dummy)

diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 6e6a74abceb1538912c706d3df528c1414bf5e16..3848fd1b41de33de9af12502173fe3e86f94d8b6 100644 (file)
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -56,7 +56,9 @@ do_check ()
   cat all.test
   st=0
   if test $use_colors = yes; then
-    make_cmd="env TERM=ansi AM_COLOR_TESTS=always $MAKE -e"
+    # Forced colorization should take place also with non-ANSI terminals;
+    # hence the "TERM=dumb" definition.
+    make_cmd="env TERM=dumb AM_COLOR_TESTS=always $MAKE -e"
   else
     make_cmd=$MAKE
   fi

diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 309d473454418b12079466beb21c5607f659ad33..aed0000ed9d63d386e1de864c43a85e4a54d3282 100644 (file)
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -26,7 +26,9 @@ am_parallel_tests=yes
 case $use_colors in
   yes)
     AM_COLOR_TESTS=always; export AM_COLOR_TESTS
-    TERM=ansi; export TERM
+    # Forced colorization should take place also with non-ANSI
+    # terminals; hence this setting.
+    TERM=dumb; export TERM
     am_opts='parallel-tests color-tests'
     ;;
   no)

diff --git a/t/color.sh b/t/color.sh
index 6db445428e8d3a7037bc32d3d79ccdb6e9c4d94e..c9fe302d0953518432f3a464646f081b3a246551 100755 (executable)
--- a/t/color.sh
+++ b/t/color.sh
@@ -102,7 +102,7 @@ test_no_color ()
   # print the whole failing recipe on standard output, we should content
   # ourselves with a laxer check, to avoid false positives.
   # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
+  if $FGREP '= Xalways; then' stdout; then
     # Extra verbose make, resort to laxer checks.
     # Note that we also want to check that the testsuite summary is
     # not unduly colorized.
@@ -141,11 +141,14 @@ for vpath in false :; do
 
   $srcdir/configure
 
-  AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; }
+  # Forced colorization should take place also with non-ANSI terminals;
+  # hence the "TERM=dumb" definition.
+  TERM=dumb AM_COLOR_TESTS=always $MAKE -e check >stdout \
+    && { cat stdout; Exit 1; }
   cat stdout
   test_color
 
-  $MAKE -e check >stdout && { cat stdout; Exit 1; }
+  TERM=ansi $MAKE -e check >stdout && { cat stdout; Exit 1; }
   cat stdout
   test_no_color
 

diff --git a/t/color2.sh b/t/color2.sh
index b1c8830ee497289cc5311257f0290686bbac0465..75f5034efcd00f6a2a5f85566e730fa11583c307 100755 (executable)
--- a/t/color2.sh
+++ b/t/color2.sh
@@ -19,9 +19,6 @@
 
 . ./defs || Exit 1
 
-TERM=ansi
-export TERM
-
 esc='\e'
 # Escape '[' for grep, below.
 red="$esc\[0;31m"
@@ -132,7 +129,7 @@ test_no_color ()
   # print the whole failing recipe on standard output, we should content
   # ourselves with a laxer check, to avoid false positives.
   # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
+  if $FGREP '= Xalways; then' stdout; then
     # Extra verbose make, resort to laxer checks.
     # Note that we also want to check that the testsuite summary is
     # not unduly colorized.
@@ -176,11 +173,16 @@ for vpath in false :; do
 
   $srcdir/configure
 
-  MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+  TERM=ansi MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
     || { cat stdout; Exit 1; }
   cat stdout
   test_color
 
+  TERM=dumb MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
+    || { cat stdout; Exit 1; }
+  cat stdout
+  test_no_color
+
   AM_COLOR_TESTS=no MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
     || { cat stdout; Exit 1; }
   cat stdout

diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
index 6307f6e4baf56ba3cfdabc6dcb918acf03cd5f36..53e542c27bc4cac94c53e2ce9a4461fb29e2334e 100755 (executable)
--- a/t/parallel-tests-reset-term.sh
+++ b/t/parallel-tests-reset-term.sh
@@ -22,6 +22,8 @@ am_parallel_tests=yes
 
 esc='\e['
 
+TERM=ansi; export TERM
+
 # Check that grep can parse nonprinting characters.
 # BSD 'grep' works from a pipe, but not a seekable file.
 # GNU or BSD 'grep -a' works on files, but is not portable.
@@ -43,14 +45,13 @@ END
 cat > foobar << 'END'
 #!/bin/sh
 echo "TERM='$TERM'"
-echo "expected_term='$expected_term'"
-test x"$TERM" = x"$expected_term"
+test x"$TERM" = x"dumb"
 END
 chmod a+x foobar
 
 mkcheck ()
 {
-  if env AM_COLOR_TESTS=always $* $MAKE check > stdout; then
+  if $MAKE "$@" check > stdout; then
     rc=0
   else
     rc=1
@@ -66,24 +67,10 @@ $AUTOCONF
 $AUTOMAKE -a
 ./configure
 
-TERM=ansi; export TERM
-expected_term=dumb; export expected_term
 mkcheck TESTS_ENVIRONMENT='TERM=dumb'
 cat stdout | grep "PASS.*foobar" | $FGREP "$esc"
 
-TERM=dumb; export TERM
-expected_term=ansi; export expected_term
-mkcheck TESTS_ENVIRONMENT='TERM=ansi'
-cat stdout | $FGREP "$esc" && Exit 1
-
-TERM=ansi; export TERM
-expected_term=dumb; export expected_term
 mkcheck AM_TESTS_ENVIRONMENT='TERM=dumb'
 cat stdout | grep "PASS.*foobar" | $FGREP "$esc"
 
-TERM=dumb; export TERM
-expected_term=ansi; export expected_term
-mkcheck AM_TESTS_ENVIRONMENT='TERM=ansi'
-cat stdout | $FGREP "$esc" && Exit 1
-
 :

diff --git a/t/tap-color.sh b/t/tap-color.sh
index b8c4004f97000e5bd7c8fa41b866c89c5c4f4cca..b803306dfa1a1d65675d4c20ad09eafcb7fbdfc0 100755 (executable)
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@ -20,8 +20,6 @@
 am_parallel_tests=yes
 . ./defs || Exit 1
 
-TERM=ansi; export TERM
-
 esc='\e'
 # Escape '[' for grep, below.
 red="$esc\[0;31m"
@@ -102,9 +100,6 @@ ok 1
 ok 2
 END
 
-AM_COLOR_TESTS=always $MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-
 test_color ()
 {
   # Not a useless use of cat; see above comments about grep.
@@ -134,7 +129,7 @@ test_no_color ()
   # print the whole failing recipe on standard output, we should content
   # ourselves with a laxer check, to avoid false positives.
   # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
+  if $FGREP '= Xalways; then' stdout; then
     # Extra verbose make, resort to laxer checks.
     # But we also want to check that the testsuite summary is not unduly
     # colorized.
@@ -162,11 +157,15 @@ test_no_color ()
   fi
 }
 
-AM_COLOR_TESTS=always $MAKE check >stdout && { cat stdout; Exit 1; }
+# Forced colorization should take place also with non-ANSI terminals;
+# hence the "TERM=dumb" definition.
+TERM=dumb AM_COLOR_TESTS=always $MAKE check >stdout \
+  && { cat stdout; Exit 1; }
 cat stdout
 test_color
 
-$MAKE -e check >stdout && { cat stdout; Exit 1; }
+TERM=ansi $MAKE -e check >stdout \
+  && { cat stdout; Exit 1; }
 cat stdout
 test_no_color