[Automake-commit] [SCM] GNU Automake branch, branch-1.13.2, updated. v1.13.1b-9-gd3844bb

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=d3844bbf1e1fb6ee580e24a9746ed5753b8c00b0

The branch, branch-1.13.2 has been updated
       via  d3844bbf1e1fb6ee580e24a9746ed5753b8c00b0 (commit)
       via  3d9997bc7128f8ffa91590e7fa69dea9b2b23a46 (commit)
       via  43e25e3849a040a4bb2dd9bab04446f0c9e88f69 (commit)
       via  9fa6029855f48e73ebac0243e1ccebe3628730ee (commit)
       via  4cb56244fa7d51fe105784ccf6447604753e6ac6 (commit)
       via  711fb0c7252e3c0538ba089b356fa55bc77e1c3c (commit)
      from  97f04a5d1f5fba976284ae4b4503b92f79a5cbd1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d3844bbf1e1fb6ee580e24a9746ed5753b8c00b0
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 14 12:32:27 2013 +0100

    tests on TAP: don't run the driver with perl unconditionally
    
    * t/ax/tap-setup.sh: When a 'Makefile.am' was pre-existent in the
    test directory at the moment the client test script sourced this
    file, said 'Makefile.am' was tweaked to provide it with a proper
    definition of TEST_LOG_DRIVER.  However, there was an error in this
    automatic definition, since it caused the TAP test driver to be
    unconditionally invoked with perl.  This wasn't an issue in most
    situations, since perl is smart enough to re-execute a given script
    with the proper interpreter if it sees a she-bang line that doesn't
    seem to point to perl itself.  Still, there is no reason to do
    something blatantly wrong even if our tools correct the dumb mistake
    for us.  So fix the TEST_LOG_DRIVER definition.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 3d9997bc7128f8ffa91590e7fa69dea9b2b23a46
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 14 12:09:43 2013 +0100

    typofix: in comments in 'automake.in'
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 43e25e3849a040a4bb2dd9bab04446f0c9e88f69
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 14 11:46:58 2013 +0100

    tests: remove obsolete (and now wrong) comment
    
    * t/ax/am-test-lib.sh: Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 9fa6029855f48e73ebac0243e1ccebe3628730ee
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 14 11:46:49 2013 +0100

    typofix: in diagnostic in test 't/tap-realtime.sh'
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 4cb56244fa7d51fe105784ccf6447604753e6ac6
Author: Stefano Lattarini <address@hidden>
Date:   Sun Feb 3 20:44:32 2013 +0100

    automake: fix reference to relevant tests in comments
    
    Some of those tests had been renamed in recent or less-recent changes.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 711fb0c7252e3c0538ba089b356fa55bc77e1c3c
Author: Stefano Lattarini <address@hidden>
Date:   Sun Feb 3 20:16:01 2013 +0100

    NEWS: we no longer plan to drop $(INCLUDES) support in next major version
    
    For a rationale and related discussion, see:
    <http://lists.gnu.org/archive/html/automake/2013-02/msg00001.html>
    
    And note that support for INCLUDES has not been re-introduced in the
    master branch yet, at the moment of writing; but we plan to definitely
    do so before the next major release.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 NEWS                |    4 ----
 automake.in         |   10 +++++-----
 t/ax/am-test-lib.sh |    2 --
 t/ax/tap-setup.sh   |    2 +-
 t/tap-realtime.sh   |    2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index f629fe2..f9a1fb1 100644
--- a/NEWS
+++ b/NEWS
@@ -29,10 +29,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 7f00346..9ed3507 100644
--- a/automake.in
+++ b/automake.in
@@ -5094,7 +5094,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")
@@ -5972,7 +5972,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))
@@ -6562,7 +6562,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
@@ -6573,7 +6573,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 '.';
              }
@@ -7409,7 +7409,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 f3fcacc..8508197 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 4fef7b3..6955c86 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/tap-realtime.sh b/t/tap-realtime.sh
index 11e607d..e9b2b0c 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


hooks/post-receive
-- 
GNU Automake