[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-601-g2066469

[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=20664697dcf4a2eabba2b1831b68f9a713d106e8

The branch, master has been updated
       via  20664697dcf4a2eabba2b1831b68f9a713d106e8 (commit)
       via  51b68122c3abc0503e8eddfc188645c9109d76c4 (commit)
       via  36bd45346b317c5cc45ae9f35b710d206ffa05c0 (commit)
      from  85eea96a3159c41b6630fd26d6f090484a131460 (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 20664697dcf4a2eabba2b1831b68f9a713d106e8
Merge: 85eea96 51b6812
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 11 13:24:06 2011 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog                             |   14 ++++++++++++++
 lib/Automake/Rule.pm                  |    2 +-
 tests/Makefile.am                     |    1 +
 tests/Makefile.in                     |    1 +
 tests/txinfo5.test                    |    3 +++
 tests/{txinfo5.test => txinfo5b.test} |    6 ++++++
 6 files changed, 26 insertions(+), 1 deletions(-)
 copy tests/{txinfo5.test => txinfo5b.test} (84%)

diff --git a/ChangeLog b/ChangeLog
index 8c5a8f4..da43d91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-11  Stefano Lattarini  <address@hidden>
+
+       tests: work around a texi+cygnus bug causing a spurious XFAIL
+       * tests/txinfo5b.test: New test, like txinfo5.test but calling
+       automake with the `-Wno-override' option to work around a bug
+       in the texinfo + cygnus interaction.
+       * tests/txinfo5.test: Update heading comments.
+       * tests/Makefile.am (TEST): Updated.
+
+2011-01-09  Dave Hart  <address@hidden>  (tiny change)
+
+       Fix another typo in Rule.pm comment.
+       * lib/Automake/Rule.pm: Fix typo.
+
 2011-01-09  Peter Rosin  <address@hidden>
 
        Fix another typo in Rule.pm comment.
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 137dbb0..6d437ed 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -307,7 +307,7 @@ sub register_action ($$)
 
 =item C<Automake::Rule::reset>
 
-The I<forget all> function.  Clears all know rules and resets some
+The I<forget all> function.  Clears all known rules and resets some
 other internal data.
 
 =cut
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5fcb616..2630ab5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -879,6 +879,7 @@ txinfo2.test \
 txinfo3.test \
 txinfo4.test \
 txinfo5.test \
+txinfo5b.test \
 txinfo6.test \
 txinfo7.test \
 txinfo8.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 591bc19..4142c6f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1142,6 +1142,7 @@ txinfo2.test \
 txinfo3.test \
 txinfo4.test \
 txinfo5.test \
+txinfo5b.test \
 txinfo6.test \
 txinfo7.test \
 txinfo8.test \
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
index 2467113..0b3ea68 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5.test
@@ -16,6 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure that texinfo.tex is not required by --cygnus.
+# Also check that TEXINFOS + cygnus work without requiring the
+# `-Wno-override' option.
+# See also sister test txinfo5b.test.
 # Report from Ian Taylor.
 
 . ./defs || Exit 1
diff --git a/tests/txinfo5.test b/tests/txinfo5b.test
similarity index 84%
copy from tests/txinfo5.test
copy to tests/txinfo5b.test
index 2467113..f14eadb 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5b.test
@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure that texinfo.tex is not required by --cygnus.
+# See also sister test txinfo5.test.
 # Report from Ian Taylor.
 
 . ./defs || Exit 1
@@ -27,6 +28,9 @@ AM_MAINTAINER_MODE
 END
 
 cat > Makefile.am << 'END'
+# Disable `override' warning to work around an unrelated
+# texi+cygnus bug.
+AUTOMAKE_OPTIONS = -Wno-override
 info_TEXINFOS = ian.texi
 END
 
@@ -34,5 +38,7 @@ echo '@setfilename ian.info' > ian.texi
 
 $ACLOCAL
 $AUTOMAKE --cygnus
+$AUTOMAKE -a --cygnus
+test ! -f texinfo.tex
 
 :


hooks/post-receive
-- 
GNU Automake