Merge branch 'master' into ng/master

* master:
  tests: avoid non-textual output in a '.log' file
  tags: refactor to reduce code duplication (2)
  tags: refactor to reduce code duplication (1)
  tests: better name for a couple of tests
  check: support colorized testsuite output by default
  tags: unify recursion for tags targets with that of "usual" targets

+ Extra non-trivial edits:

* automake.in (handle_tests): Drop the '%COLOR%' transform in the
processing of both 'serial-tests.am' and 'parallel-tests.am', which
have superseded the 'check.am' from mainline Automake.
* lib/am/color-tests.am: Remove use of the '%?COLOR%' transform;
just act as if it were unconditionally TRUE.
(am__tty_colors_dummy): Merge into ...
(am__tty_colors): ... this.

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

1 files changed, 4 insertions, 6 deletions

diff --git a/t/maken3.sh b/t/maken3.sh
index b1875cbe1..5dbe7d23a 100755
--- a/t/maken3.sh
+++ b/t/maken3.sh
@@ -20,7 +20,7 @@
 #  2. the output from make is sufficiently complete.
 #
 # This test exercises the GCS-mandated targets (except for dist)
-# as well as tags, TAGS.
+# as well as tags.
 
 # For gen-testsuite-part: ==> try-with-serial-tests <==
 . ./defs || exit 1
@@ -94,8 +94,6 @@ installcheck-local:
 	@: > stamp-installcheck-sub
 tags:
 	@: > stamp-tags-sub
-TAGS:
-	@: > stamp-TAGS-sub
 mostlyclean-local:
 	@: > stamp-mostlyclean-sub
 maintainer-clean-local:
@@ -110,7 +108,7 @@ html:
 	@: > sub2-$@-should-not-be-executed
 install-info install-html install-dvi install-pdf install-ps:
 	@: > sub2-$@-should-not-be-executed
-installcheck installdirs tags TAGS mostlyclean:
+installcheck installdirs tags mostlyclean:
 	@: > sub2-$@-should-not-be-executed
 ## These targets cannot be overridden like this:
 ## install-strip distclean maintainer-clean
@@ -125,12 +123,12 @@ check_targets ()
     all install install-strip uninstall clean distclean check \
     info html dvi pdf ps \
     install-info install-html install-dvi install-pdf install-ps \
-    installcheck installdirs tags TAGS mostlyclean maintainer-clean
+    installcheck installdirs tags mostlyclean maintainer-clean
   do
     $MAKE -n $target >stdout || { cat stdout; exit 1; }
     cat stdout
     case $target in
-    install-* | installdirs | tags | TAGS ) ;;
+    install-* | installdirs | tags ) ;;
     *)
       grep "stamp-$target$" stdout || exit 1
       test ! -e "stamp-$target" || exit 1