Merge branch 'maint'

* maint:
  typofix: in comments in 't/ax/test-lib.sh'
  tests on TAP: don't run the driver with perl unconditionally
  typofix: in comments in 'automake.in'
  tests: remove obsolete (and now wrong) comment
  typofix: in diagnostic in test 't/tap-realtime.sh'
  automake: fix reference to relevant tests in comments
  NEWS: we no longer plan to drop $(INCLUDES) support in next major version

6 files changed, 8 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index de85f9481..2e2648543 100644
--- a/NEWS
+++ b/NEWS
@@ -80,10 +80,6 @@ New in 1.13.2:
     DJGPP project).  Note however that both Cygwin and MSYS/MinGW on
     modern Windows versions will continue to be fully supported.
 
-  - Support for the long-deprecated INCLUDES variable will be removed
-    altogether in Automake 1.14.  The AM_CPPFLAGS variable should be
-    used instead.
-
   - Automake-provided scripts and makefile recipes might (finally!)
     start assuming a POSIX shell in Automake 1.14.
 
diff --git a/automake.in b/automake.in
index 4776581c5..70214e45e 100644
--- a/automake.in
+++ b/automake.in
@@ -5127,7 +5127,7 @@ sub scan_autoconf_config_files ($$)
       # Handle $local:$input syntax.
       my ($local, @rest) = split (/:/);
       @rest = ("$local.in",) unless @rest;
-      # Keep in sync with 'conffile-leading-dot.test'.
+      # Keep in sync with test 'conffile-leading-dot.sh'.
       msg ('unsupported', $where,
            "omit leading './' from config file names such as '$local';"
            . "\nremake rules might be subtly broken otherwise")
@@ -5951,7 +5951,7 @@ sub register_language (%)
   # Update the pattern of known extensions.
   accept_extensions (@{$lang->extensions});
 
-  # Upate the $suffix_rule map.
+  # Update the $suffix_rule map.
   foreach my $suffix (@{$lang->extensions})
     {
       foreach my $dest (&{$lang->output_extensions} ($suffix))
@@ -6541,7 +6541,7 @@ sub read_am_file ($$)
 		# otherwise OSF make will implicitly copy the included
 		# file in the build tree during "make distdir" to satisfy
 		# the dependency.
-		# (subdircond2.test and subdircond3.test will fail.)
+		# (subdir-am-cond.sh and subdir-ac-cond.sh will fail)
 		push_dist_common ("\$\(top_srcdir\)/$path");
 	      }
 	    else
@@ -6552,7 +6552,7 @@ sub read_am_file ($$)
 		# otherwise OSF make will implicitly copy the included
 		# file in the build tree during "make distdir" to satisfy
 		# the dependency.
-		# (subdircond2.test and subdircond3.test will fail.)
+		# (subdir-am-cond.sh and subdir-ac-cond.sh will fail)
 		push_dist_common ("\$\(srcdir\)/$path");
 		$path = $relative_dir . "/" . $path if $relative_dir ne '.';
 	      }
@@ -7388,7 +7388,7 @@ sub push_required_file
     }
   # This is needed to allow a construct in a non-top-level Makefile.am
   # to require a file in the build-aux directory (see at least the test
-  # script 'test-driver-is-distributed.test').  This is related to the
+  # script 'test-driver-is-distributed.sh').  This is related to the
   # automake bug#9546.  Note that the use of $config_aux_dir instead
   # of $am_config_aux_dir here is deliberate and necessary.
   elsif ($dir eq $config_aux_dir)
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 0ceb4d09c..1662d3830 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -439,8 +439,6 @@ fetch_tap_driver ()
     || framework_failure_ "couldn't fetch $am_tap_implementation TAP driver"
   sed 10q tap-driver # For debugging.
 }
-# The shell/awk implementation of the TAP driver is still mostly dummy, so
-# use the perl implementation by default for the moment.
 am_tap_implementation=${am_tap_implementation-shell}
 
 # $PYTHON and support for PEP-3147.  Needed to check our python-related
diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh
index 4fef7b308..6955c86a0 100644
--- a/t/ax/tap-setup.sh
+++ b/t/ax/tap-setup.sh
@@ -36,7 +36,7 @@ fetch_tap_driver
 if test -f Makefile.am~; then
   mv -f Makefile.am~ Makefile.am \
     || fatal_ "failed to restore Makefile.am"
-  echo 'TEST_LOG_DRIVER = $(PERL) $(srcdir)/tap-driver' >> Makefile.am \
+  echo 'TEST_LOG_DRIVER = $(srcdir)/tap-driver' >> Makefile.am \
     || fatal_ "failed to update Makefile.am"
   $AUTOMAKE Makefile \
     || fatal_ "failed to remake Makefile.in"
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 81f917015..a3c16eed8 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -258,7 +258,7 @@ am_set_exit_traps ()
   trap "fatal_ 'caught signal SIGINT'" 2
   trap "fatal_ 'caught signal SIGTERM'" 15
   # Various shells seems to just ignore SIGQUIT under some circumstances,
-  # even if the signal is not blocked; however, if the signal it trapped,
+  # even if the signal is not blocked; however, if the signal is trapped,
   # the trap gets correctly executed.  So we also trap SIGQUIT.
   # Here is a list of some shells that have been verified to exhibit the
   # problematic behavior with SIGQUIT:
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
index 11e607de5..e9b2b0c3b 100755
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.sh
@@ -45,7 +45,7 @@ rm -f expect-check
 # user as soon as it gets it.
 if ! using_gmake; then
   case $MAKE in
-    *\ -j*) skip_ "doesn't with non-GNU concurrent make";;
+    *\ -j*) skip_ "doesn't work with non-GNU concurrent make";;
   esac
   # Prevent Sun Distributed Make from trying to run in parallel.
   DMAKE_MODE=serial; export DMAKE_MODE