[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1598-g268d66e

[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=268d66ec2fc3b8525e99b6dcdec2d4d9e3eaa93e

The branch, testsuite-work has been updated
       via  268d66ec2fc3b8525e99b6dcdec2d4d9e3eaa93e (commit)
       via  c5f878aba841b360f499cf528a60ec49064fa269 (commit)
       via  63da4921d542b2c329cf95f58c955b9972c5d161 (commit)
       via  fb49574d11f61b23b2a25a81e032df7cc5c9b296 (commit)
       via  d2b76f88a2214b15344a00b4100e5f3b87d97198 (commit)
       via  30bd6d1e53fbc31ef3431893e4db3efe9ad799ee (commit)
       via  acd3ff403ae131a7882fb8a38402f519463291c1 (commit)
       via  ccbb437e8102c4cf3779aaef9dc3e06364c4aa02 (commit)
       via  e94a2808b5b885b3c780fadeabceef5a302d8077 (commit)
       via  9c78ef3d74b138432801f72f5f8f50c7433d03b5 (commit)
       via  9508ef35139a066171cb6aedfa63000482477495 (commit)
       via  6416c6b854a6a24070d93c426f0f668657558af8 (commit)
       via  f2d8555cadc9969195a3b715d5f01cb24705d8c7 (commit)
       via  b2b292816d660a844e249225b9fd9bbacc6f718a (commit)
       via  38087e06a5a13bb1bcc89bb773da3cf48aafcc8b (commit)
       via  beff03e0d0754e8ad8dadc5e2ece853bcba2689f (commit)
       via  c3d589126cded2a41c3782e49b209f6d18e5a4e6 (commit)
      from  1ca9efa3c2550e2ccc62056cd1add08e9583deae (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 268d66ec2fc3b8525e99b6dcdec2d4d9e3eaa93e
Merge: 1ca9efa c5f878a
Author: Stefano Lattarini <address@hidden>
Date:   Tue Dec 20 14:16:25 2011 +0100

    Merge branch 'master' into testsuite-work

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

Summary of changes:
 ChangeLog                    |   80 ++++++++++++++++++++++++++++++++++++++++++
 HACKING                      |   47 ++++++++++++------------
 Makefile.am                  |    6 ++-
 Makefile.in                  |    2 +-
 NEWS                         |    2 +-
 README                       |   30 ++++++++++------
 README-alpha                 |    3 --
 tests/README                 |    4 --
 tests/defs-static.in         |   10 +++++
 tests/remake-am-pr10111.test |    6 ++--
 10 files changed, 141 insertions(+), 49 deletions(-)
 mode change 100644 => 100755 tests/remake-am-pr10111.test
 mode change 100644 => 100755 tests/remake-m4-pr10111.test

diff --git a/ChangeLog b/ChangeLog
index 2de1e05..80b9556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       test defs: hack to support autoconf-wrapper programs
+       * tests/defs-static.in ($AUTOCONF): Add a dummy `-B' option to the
+       autoconf invocation, so that, when the Debian autoconf wrapper is
+       involved, it will correctly dispatch an autoconf >= 2.50 instead of
+       defaulting to autoconf 2.13.
+       ($AUTOHEADER, $AUTORECONF): Likewise, but for autoheader and
+       autoreconf respectively.
+       Reported by Bruno Haible:
+       <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
+
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       tests: fix a minor spurious failure with FreeBSD make
+       * tests/remake-am-pr10111.test: Avoid using `#' comments in
+       makefile recipes, as these have been confusing FreeBSD make.
+       The failure was masked by the fact that this test is currently
+       expected to fail.
+       Suggested by a report from Bruno Haible.
+
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       tests: make two test scripts executable
+       * tests/remake-am-pr10111.test: Make executable.
+       * tests/remake-m4-pr10111.test: Likewise.
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: reference webpages for automake mailing lists
+       * README: Rationalize and reorganize the (brief) description of
+       the automake mailing lists.   In particular, instead of suggesting
+       the reader to write to the `-request' addresses to subscribe to
+       mailing lists, point him to the relevant webpages, where he can
+       also subscribe via a web form.
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: update advice about testsuite execution
+       * README: Now that the automake testsuite uses the parallel-tests
+       driver, there is no need for the user to capture the stdout of
+       "make check" to determine which tests have failed: a detailed log
+       is automatically saved into the `tests/test-suite.log' file.
+       Since we are at it, improve the wording by dropping an extra
+       "please".
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: don't reference the old homepage at sources.redhat.com
+       * README: Don't reference the old homepage at sources.redhat.com,
+       which is no longer active; reference the homepage on www.gnu.org
+       instead.  See also automake bug#10157 and bug#10248.
+       * tests/README: Likewise, and remove related extra-pedantic advice
+       about copyright papers for test cases (we'll ask for those papers
+       explicitly when we think they are warranted).
+
+2011-12-12  Stefano Lattarini  <address@hidden>
+
+       hacking: some more fixlets
+       * HACKING (Release Procedure): Place the list of pre-release
+       bootstrap-and-test commands on a line of its own, so it's easy to
+       select and then paste it into a terminal window.
+       Fix the explanation of "make git-release", as, since the previous
+       change, "make git-release" would simply run "make dist" rather
+       than "make distcheck".
+       Suggestion from Jim Meyering.
+
+2011-12-12  Peter Rosin  <address@hidden>
+
+       * NEWS: Fix typo in 'make dist-bzip2' description.
+
+2011-12-10  Stefano Lattarini  <address@hidden>
+
+       release: don't run "make distcheck" automatically
+       * Makefile.am (git-dist): The developers should test extensively
+       before finally creating the release tarball; so don't run "make
+       distcheck" on their behalf here; instead ...
+       * HACKING (Release procedure): ... state here that "make check"
+       and "make distcheck" should be run before calling "make git-dist".
+
 2011-12-15  Stefano Lattarini  <address@hidden>
 
        tests: fix spurious failure in 'color2.test'
diff --git a/HACKING b/HACKING
index 1cc43fe..0fbcbe6 100644
--- a/HACKING
+++ b/HACKING
@@ -10,12 +10,18 @@
 ================================================================
 = Administrivia
 
+* The correct response to most actual bugs is to write a new test case
+  which demonstrates the bug.  Then fix the bug, re-run the test suite,
+  and check everything in.
+
 * If you incorporate a change from somebody on the net:
   First, if it is a large change, you must make sure they have signed the
   appropriate paperwork.
   Second, be sure to add their name and email address to THANKS
 
 * If a change fixes a test, mention the test in the ChangeLog entry.
+  If a change fixes a bug registered in the Automake debbugs tracker,
+  mention the bug number in the ChangeLog entry.
 
 * If somebody reports a new bug, mention his name in the ChangeLog entry
   and in the test case you write.  Put him into THANKS.
@@ -24,10 +30,6 @@
   sure to add a test case for it, and to reference such test case from
   a proper Texinfo comment.
 
-* The correct response to most actual bugs is to write a new test case
-  which demonstrates the bug.  Then fix the bug, re-run the test suite,
-  and check everything in.
-
 * Some files in the automake package are not owned by automake.  These
   files should never be edited here.  These files are
       COPYING (from FSF),
@@ -151,9 +153,9 @@
 
 * There may be a number of longer-lived feature branches for new developments.
   They should be based off of a common ancestor of all active branches to
-  which the feature should be merged later.  The next branch may serve as
-  common ground for feature merging and testing, should they not be ready
-  for master yet.
+  which the feature should or might be merged later.  The next branch may
+  serve as common ground for feature merging and testing, should they not
+  be ready for master yet.
 
 * For merges from branches other than maint, prefer 'git merge --log' over
   plain 'git merge', so that a later 'git log' gives an indication of which
@@ -187,6 +189,10 @@
 ================================================================
 = Release procedure
 
+* The steps outlined here are meant to be followed for alpha and stable
+  releases as well.  Where differences are expected, they will be
+  explicitly described.
+
 * Fetch new versions of the files that are maintained by the FSF.
   Commit.  Unfortunately you need an FSF account to do this.
   (You can also use `make fetch', but that is still woefully incomplete.)
@@ -200,13 +206,14 @@
 
 * Update ChangeLog.
 
-* Run ./bootstrap, ./configure, make.
+* Run this:
+  ./bootstrap && ./configure && make && make check && make distcheck
 
 * Run `make release-stats' if release statistics in doc/automake.texi
   have not been updated yet.
 
 * Run `make git-release'.
-  This will run distcheck to create the tarballs, commit the last
+  This will run "make dist" to create the tarballs, commit the last
   NEWS/configure.ac/ChangeLog changes, tag the repository, sign
   the tarballs, and upload them.
   Use `make GNUPLOADFLAGS="--user key" git-release' to sign with
@@ -218,18 +225,7 @@
 * Don't forget to `git push' your changes so they appear in the public
   git tree.
 
-* Update the web pages at sources.redhat.com:
-  - bump version in index.rst,
-  - add entry to news.rst,
-  - run `make' to update .html files,
-  - create manuals:
-      cd doc
-      make pdf
-      make html MAKEINFOFLAGS=--no-split
-  - copy automake.html and automake.pdf to web cvs,
-  - add ChangeLog entry and commit.
-
-* Update the manuals at www.gnu.org:
+* For stable releases, update the manuals at www.gnu.org:
   - Generate manuals:
     cd doc
     wget 
"http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh";
@@ -240,9 +236,12 @@
   - Check for link errors, fix them, recheck until convergence:
     <http://validator.w3.org/checklink>
 
-* Send announcement at least to address@hidden, and
-  address@hidden  If not an alpha, announcement must also go to
-  address@hidden  Copy this announcement into the NEWS feed at
+* Send the announcement at least to <address@hidden> and
+  <address@hidden>.  If the release is a stable one, the announcement
+  must also go to <address@hidden>; if it is an alpha or beta release,
+  announcement should be sent also to <address@hidden>, to
+  maximize the possibility of early testing on exotic or proprietary
+  systems.  Finally, copy the announcement into the NEWS feed at
   <https://savannah.gnu.org/projects/automake>.
 
 -----
diff --git a/Makefile.am b/Makefile.am
index cb6ecf5..3c56cd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -737,8 +737,10 @@ git-dist: maintainer-check
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-## Build the distribution
-       $(MAKE) $(AM_MAKEFLAGS) distcheck
+## Build the distribution.  We expect the developer to have already run
+## "make check" and "make distcheck" on his own (as required in the
+## HACKING file, section "Release procedure").
+       $(MAKE) $(AM_MAKEFLAGS) dist
 ## Finally, if anything was successful, commit the last changes and tag
 ## the release in the repository.  We don't use RCS keywords so it's OK
 ## to distribute the files before they were committed.
diff --git a/Makefile.in b/Makefile.in
index 14edb72..2285e90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1460,7 +1460,7 @@ git-dist: maintainer-check
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-       $(MAKE) $(AM_MAKEFLAGS) distcheck
+       $(MAKE) $(AM_MAKEFLAGS) dist
        $(am__cd) $(srcdir) && git commit -a -s && \
           git tag -s "v$(VERSION)" -m "Release $(VERSION)"
 
diff --git a/NEWS b/NEWS
index 3635dc4..b71e6d4 100644
--- a/NEWS
+++ b/NEWS
@@ -109,7 +109,7 @@ New in 1.11a:
   - You may adjust the compression options used in dist-xz and dist-bzip2.
     The default is now merely -e for xz, but still -9 for bzip;  you may
     specify a different level via the XZ_OPT and BZIP2 envvars respectively.
-    E.g., "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5"
+    E.g., "make dist-xz XZ_OPT=-7" or "make dist-bzip2 BZIP2=-5"
 
   - Some auxiliary files that are automatically distributed by Automake
     (e.g., `install-sh', or the `depcomp' script for packages compiling
diff --git a/README b/README
index eb49e71..3f2414f 100644
--- a/README
+++ b/README
@@ -23,23 +23,31 @@ Automake has a test suite.  Use
 
        make check
 
-to run it.  Capture its output in case of failing tests.  For more
-information, please see the file tests/README.
+to run it.  For more information, see the file tests/README.
 
 Automake has a page on the web.  See:
 
-       http://sources.redhat.com/automake/
+       http://www.gnu.org/software/automake/
 
-The mailing list address@hidden is for discussion of Automake and
-its interactions with other configuration/portability tools like
-Autoconf or Libtool.  Write to address@hidden if you want to
-join.
+Automake also has three mailing lists:
 
-Mail suggestions and bug reports to address@hidden, patches
-to address@hidden
+  * address@hidden
+    For general discussions of Automake and its interactions with other
+    configuration/portability tools like Autoconf or Libtool.
 
-New releases are announced to address@hidden  Write to
address@hidden if you want to receive them.
+  * address@hidden
+    Where to send bug reports and feature requests.
+
+  * address@hidden
+    Where to send patches, and discuss the automake development process
+    and the  design of new features.
+
+To obtain more information about these list, or to subscribe to them,
+refer to <http://www.gnu.org/software/automake/#mailinglists>
+
+New releases are announced to address@hidden  If you want to
+be informed, subscribe to that list by following the instructions at
+<http://lists.gnu.org/mailman/listinfo/autotools-announce>.
 
 -----
 
diff --git a/README-alpha b/README-alpha
index 193a6dd..820bf73 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,9 +1,6 @@
 This is a test release of this package.  Using it more or less
 implicitly signs you up to help me find whatever problems you report.
 
-The documentation still needs more work.  Suggestions welcome.
-Patches even more welcome.
-
 Please send comments and problem reports about this test release to
 address@hidden  This program will get better only if you report the
 problems you encounter.
diff --git a/tests/README b/tests/README
index 980299d..64e977a 100644
--- a/tests/README
+++ b/tests/README
@@ -284,7 +284,3 @@ Do not
   sub-make may not pass `prefix=/opt' along).  Use the following
   instead:
     prefix=/opt $MAKE -e install
-
-  Do not send a test case without signing a copyright disclaimer.
-  See http://sources.redhat.com/automake/contribute.html or
-  ask <address@hidden> for details.
diff --git a/tests/defs-static.in b/tests/defs-static.in
index df2fd43..af8f501 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -178,6 +178,16 @@ ACLOCAL="$am_original_ACLOCAL -Werror"
 # should use $am_original_AUTOMAKE instead.
 AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror -Wall"
 
+# This is a hack to seamlessly support the infamous "autoconf wrappers",
+# that might dispatch different autoconf versions depending on the name
+# of the input files and/or the command-line options used.  See:
+# <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
+# FIXME: in the long run, the better fix will be to convert our testsuite
+# to use `configure.ac' instead of `configure.in' as autoconf input.
+AUTOCONF="$AUTOCONF -B /no/such/dir"
+AUTOM4TE="$AUTOM4TE -B /no/such/dir"
+AUTORECONF="$AUTORECONF -B /no/such/dir"
+
 # POSIX no longer requires 'egrep' and 'fgrep',
 # but some hosts lack 'grep -E' and 'grep -F'.
 EGREP=${AM_TESTSUITE_EGREP-'@EGREP@'}
diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test
old mode 100644
new mode 100755
index 6f622f8..888c9dd
--- a/tests/remake-am-pr10111.test
+++ b/tests/remake-am-pr10111.test
@@ -35,9 +35,9 @@ END
 cat > Makefile.am <<'END'
 include $(srcdir)/foobar.am
 $(srcdir)/foobar.am:
-## Creative quoting to avoid spurious matches in the grepping
+## Creative quoting is to avoid spurious matches in the grepping
 ## of Makefile.in, later.
-       echo '#' 'foobar' 'was 'here' '#' > $@
+       echo "mu =" foobar "was here =" > $@
 END
 
 $ACLOCAL
@@ -58,7 +58,7 @@ cd build
 # included by configure.in works also in VPATH builds.
 rm -f ../foobar.am
 $MAKE
-grep '# foobar was here #' ../Makefile.in
+grep '= foobar was here =' ../Makefile.in
 $MAKE distcheck
 
 :
diff --git a/tests/remake-m4-pr10111.test b/tests/remake-m4-pr10111.test
old mode 100644
new mode 100755


hooks/post-receive
-- 
GNU Automake