[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-748-g370e577

[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=370e5775c20872a8f2b5c1e520b31dc1544b9cd8

The branch, maint has been updated
       via  370e5775c20872a8f2b5c1e520b31dc1544b9cd8 (commit)
       via  ddac05053058efd64d67609d30bae20445ae584b (commit)
      from  27f3c56209a91724b0d83d0dd655f0eae0a698a9 (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 370e5775c20872a8f2b5c1e520b31dc1544b9cd8
Author: Stefano Lattarini <address@hidden>
Date:   Fri Mar 9 21:35:04 2012 +0100

    coverage: expose automake bug#10975
    
    * tests/dist-pr10975.test: New test.
    * tests/list-of-tests.mk: Add it.
    * tests/Makefile.am (XFAIL_TESTS): Likewise.

commit ddac05053058efd64d67609d30bae20445ae584b
Author: Stefano Lattarini <address@hidden>
Date:   Wed Mar 7 23:26:24 2012 +0100

    getopt: relax version requirement for perl
    
    * lib/Automake/Getopt.pm: Require perl 5.6.0, not 5.6.2: the former
    is enough.  See also commit 'v1.11-2054-g7df05a0' on master (dated
    04-03-2012).

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

Summary of changes:
 lib/Automake/Getopt.pm                     |    2 +-
 tests/Makefile.am                          |    1 +
 tests/{extra10.test => dist-pr109765.test} |   42 ++++++++++++++--------------
 tests/list-of-tests.mk                     |    1 +
 4 files changed, 24 insertions(+), 22 deletions(-)
 copy tests/{extra10.test => dist-pr109765.test} (54%)

diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm
index 84cee5e..e1a3968 100644
--- a/lib/Automake/Getopt.pm
+++ b/lib/Automake/Getopt.pm
@@ -30,7 +30,7 @@ line options in conformance to the GNU Coding standards.
 
 =cut
 
-use 5.006_002;
+use 5.006;
 use strict;
 use warnings FATAL => 'all';
 use Exporter ();
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d909942..b8ede30 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,6 +23,7 @@ auxdir2.test \
 cond17.test \
 dist-auxfile.test \
 dist-auxfile-2.test \
+dist-pr109765.test \
 gcj6.test \
 java-nobase.test \
 objext-pr10128.test \
diff --git a/tests/extra10.test b/tests/dist-pr109765.test
similarity index 54%
copy from tests/extra10.test
copy to tests/dist-pr109765.test
index 7bd6556..d656d56 100755
--- a/tests/extra10.test
+++ b/tests/dist-pr109765.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010  Free Software Foundation, Inc.
+# 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
@@ -14,31 +14,31 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that wildcards in EXTRA_DIST are honoured.
-# Suggested by observations from Braden McDaniel.
+# Expose automake bug#10975: when several "dist-*" targets are invoked
+# on the make command line, the first one ends up removing the distdir,
+# so that the latter ones fail.
 
-required=GNUmake
+required=bzip2
 . ./defs || Exit 1
 
 set -e
 
 echo AC_OUTPUT >> configure.in
+: > Makefile.am
+
+$ACLOCAL  || fatal_ "aclocal failed"
+$AUTOCONF || fatal_ "autoconf failed"
+$AUTOMAKE || fatal_ "automake failed"
 
-cat > Makefile.am <<'END'
-EXTRA_DIST=*.foo
-.PHONY: test
-test: distdir
-       diff a.foo $(distdir)/a.foo
-       diff b.foo $(distdir)/b.foo
-       test ! -r $(distdir)/c.bar
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-echo aaa > a.foo
-echo bbb > b.foo
-echo ccc > c.foo
 ./configure
-$MAKE test
+$MAKE dist-gzip dist-bzip2
+
+gzip -dc $distdir.tar.gz | tar tf - > one || { cat one; Exit 1; }
+cat one
+bzip2 -dc $distdir.tar.gz | tar tf - > two || { cat two; Exit 1; }
+cat two
+
+$FGREP "$distdir/Makefile.am" one
+diff one two
+
+:
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 420b56b..023bf3b 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -332,6 +332,7 @@ dist-included-parent-dir.test \
 dist-missing-am.test \
 dist-missing-included-m4.test \
 dist-missing-m4.test \
+dist-pr109765.test \
 distcleancheck.test \
 distcom2.test \
 distcom3.test \


hooks/post-receive
-- 
GNU Automake