[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1756-g8d51cdc

[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=8d51cdc0d813f09177e07476b45285b8589efe00

The branch, master has been updated
       via  8d51cdc0d813f09177e07476b45285b8589efe00 (commit)
       via  bb9e2e6271adc481fc2b522ed06dd52f18e0ed45 (commit)
       via  e29c49181fb4ffa2506ca690964b5e9e07c8fb49 (commit)
      from  d6a1475034ac4ac85cad9a02b9d97d42fa9821c3 (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 8d51cdc0d813f09177e07476b45285b8589efe00
Merge: bb9e2e6 e29c491
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 17 14:20:40 2012 +0100

    Merge branch 'maint'
    
    * maint:
      contrib: new, a directory for non-mainstream functionalities

commit bb9e2e6271adc481fc2b522ed06dd52f18e0ed45
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 17 13:46:11 2012 +0100

    tap: some makes in parallel mode unconditionally serialize output
    
    Some make implementations (among them, FreeBSD make, NetBSD make,
    and Solaris Distributed Make), when run in parallel mode, serialize
    the output from their targets' recipes unconditionally.  This has
    the nasty side effect that the user won't see the partial results
    of a TAP test until the test has terminated.  This is not something
    our TAP driver script can work around unfortunately; in fact, the
    driver is sending out its output progressively and "in sync" with
    test execution -- it is make that is stowing such output away
    instead of presenting it to the user as soon as it gets it.
    
    So we content ourself with working around the issue in our
    testsuite, to at least avoid failures we could do nothing to
    prevent.
    
    * tests/tap-realtime.test: Skip this test if the make program used
    is a non-GNU make running in parallel mode.  And if Sun dmake is
    being used, try to force it to run in serial mode, by exporting the
    'DMAKE_MODE' environment variable to "serial".

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

Summary of changes:
 .../tests/Version2.pl => contrib/Makefile.am       |   18 ++++++------
 contrib/README                                     |   27 ++++++++++++++++++++
 tests/tap-realtime.test                            |   21 ++++++++++++++-
 3 files changed, 55 insertions(+), 11 deletions(-)
 copy lib/Automake/tests/Version2.pl => contrib/Makefile.am (78%)
 create mode 100644 contrib/README

diff --git a/lib/Automake/tests/Version2.pl b/contrib/Makefile.am
similarity index 78%
copy from lib/Automake/tests/Version2.pl
copy to contrib/Makefile.am
index c1981a0..b491923 100644
--- a/lib/Automake/tests/Version2.pl
+++ b/contrib/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#
+## Process this file with automake to create Makefile.in
+
+## Makefile for Automake contrib.
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
-#
+
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# prog_error due to invalid $VERSION.
-
-use Automake::Version;
-
-Automake::Version::check ('', '1.2.3');
+EXTRA_DIST = README
diff --git a/contrib/README b/contrib/README
new file mode 100644
index 0000000..bbef72f
--- /dev/null
+++ b/contrib/README
@@ -0,0 +1,27 @@
+This is the 'contrib' directory of the GNU Automake distribution.
+
+Here you'll find additions to the Automake base distribution, in form of
+makefile fragments, m4 macros, scripts, documentation, et cetera.  Such
+addition that might be useful for a significant percentage of its general
+audience, but (for one reason or another) are not deemed appropriate for
+inclusion into the Automake core.
+
+There are several reasons for which a feature can be kept in contrib:
+
+  1. The long-term usefulness of the feature is debatable and uncertain;
+     on-field and real-word testing are necessary to prove or disprove
+     its usefulness, before the feature can be committed into the Automake
+     core (as doing so too early would later force us to continue the
+     support for backward-compatibility, even if the features proves
+     flawed or fails to attract widespread use).
+  
+  2. The APIs or overall design of the feature are still unstable, and
+     need on-field testing to iron warts and usability bugs, or uncover
+     potential flaws.
+
+  3. The feature was an historical one, mostly obsoleted but still used
+     "here and there" in the wild; so we want to to deprecate it and
+     remove it from the Automake core, but cannot remove it altogether,
+     for the sake of those still-existing usage.  So it gets moved in
+     contrib.
+
diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index dd4621c..d30af2e 100755
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,6 +35,23 @@ expect -f expect-check || {
 }
 rm -f expect-check
 
+# Unfortunately, some make implementations (among them, FreeBSD make,
+# NetBSD make, and Solaris Distributed make), when run in parallel mode,
+# serialize the output from their targets' recipes unconditionally.  In
+# such a situation, there's no way the partial results of a TAP test can
+# be displayed until the test has terminated.  And this is not something
+# our TAP driver script can work around; in fact, the driver *is* sending
+# out its output progressively and "in sync" with test execution -- it is
+# make that is stowing such output away instead of presenting it to the
+# user as soon as it gets it.
+if using_gmake; then :; else
+  case $MAKE in
+    *\ -j*) skip_ "doesn't with non-GNU concurrent make";;
+  esac
+  # Prevent Sun Distributed Make from trying to run in parallel.
+  DMAKE_MODE=serial; export DMAKE_MODE
+fi
+
 cat > Makefile.am << 'END'
 TESTS = all.test
 END
@@ -44,7 +61,7 @@ cat > all.test <<'END'
 #! /bin/sh
 echo 1..3
 
-# Creative quoting to placate maintainer-check
+# Creative quoting to placate maintainer-check.
 sleep="sleep "3
 
 # The awk+shell implementation of the TAP driver must "read ahead" of one


hooks/post-receive
-- 
GNU Automake