[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-468-g3f2d217

[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=3f2d21795e8f70399ea27649ca54cc9080f2825a

The branch, master has been updated
       via  3f2d21795e8f70399ea27649ca54cc9080f2825a (commit)
       via  1d9dbc3e8d012c9d023a3ef96cb625d424a6fff0 (commit)
       via  15cd54c001e1510c6593adfd3391f69d4bcc9c45 (commit)
       via  b27b2126762e3a39c04548dc21ed30d4cc2c3de7 (commit)
       via  3262c47dcfebd2dbfe79f8c885ff81fda6c0a86b (commit)
       via  d32c553430f0e2e9807ef7245d26239e075a283a (commit)
      from  1c914a574432d1f86f4f9c80c6c6c112955841ac (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 3f2d21795e8f70399ea27649ca54cc9080f2825a
Merge: 1d9dbc3 15cd54c
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 19 21:24:43 2010 +0100

    Merge branch 'maint'

commit 1d9dbc3e8d012c9d023a3ef96cb625d424a6fff0
Merge: 1c914a5 d32c553
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 19 21:20:03 2010 +0100

    Merge branch 'test-repeated-options'

commit d32c553430f0e2e9807ef7245d26239e075a283a
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 19 12:19:36 2010 +0100

    New test on repeated automake options.
    
    * tests/repeated-options.test: New test, check that automake
    does not complain on repeated options, nor generate broken or
    incorrect makefiles.
    * tests/Makefile.am (TESTS): Updated.

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

Summary of changes:
 ChangeLog                   |   23 ++++++++++++
 lib/Automake/Config.in      |    2 +-
 tests/Makefile.am           |    1 +
 tests/Makefile.in           |    1 +
 tests/help2.test            |   12 ++++++-
 tests/help4.test            |    4 +-
 tests/repeated-options.test |   80 +++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100755 tests/repeated-options.test

diff --git a/ChangeLog b/ChangeLog
index a78cdd8..92b6ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-19  Stefano Lattarini  <address@hidden>
+
+       Automake::Config: remove extra trailing semicolon.
+       * lib/Automake/Config.in: Remove extra trailing semicolon.
+
+       help4.test: fix botched heading comment.
+       * tests/help4.test: Fixed the heading comment, since it
+       didn't correctly describe what checks the testcase was
+       supposed to perform.
+
+       help2.test: add checks on aclocal too.
+       * tests/help2.test: Check that also `aclocal --version' and
+       `aclocal --help' work with configure.in and acinclude.m4 both
+       broken.
+
+2010-11-19  Stefano Lattarini  <address@hidden>
+
+       New test on repeated automake options.
+       * tests/repeated-options.test: New test, check that automake
+       does not complain on repeated options, nor generate broken or
+       incorrect makefiles.
+       * tests/Makefile.am (TESTS): Updated.
+
 2010-11-17  Stefano Lattarini  <address@hidden>
 
        Fix spurious failures of silent-rules tests with Sun Fortran.
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 7e87044..b6674dc 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -34,7 +34,7 @@ our $VERSION = '@VERSION@';
 our $libdir = '@datadir@/@address@hidden@APIVERSION@';
 our $perl_threads = @PERL_THREADS@;
 
-1;;
+1;
 
 ### Setup "GNU" style for perl-mode and cperl-mode.
 ## Local Variables:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f560b3..21134bf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -705,6 +705,7 @@ regex-obsolete.test \
 req.test \
 reqd.test \
 reqd2.test \
+repeated-options.test \
 rulepat.test \
 sanity.test \
 scripts.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2cf97a0..69cab0d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -967,6 +967,7 @@ regex-obsolete.test \
 req.test \
 reqd.test \
 reqd2.test \
+repeated-options.test \
 rulepat.test \
 sanity.test \
 scripts.test \
diff --git a/tests/help2.test b/tests/help2.test
index 5212092..b74f30a 100755
--- a/tests/help2.test
+++ b/tests/help2.test
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure --help and --version work, even when the current directory
-# contains a broken configure.in.
+# contains a broken configure.in and a broken acinclude.m4.
 . ./defs || Exit 1
 
 set -e
@@ -29,9 +29,19 @@ ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
 AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
 
 echo '[' > configure.in
+echo '[' > acinclude.m4
 
 $AUTOMAKE --version
 $AUTOMAKE --help
+$ACLOCAL --version
+$ACLOCAL --help
+
+# Sanity check: aclocal cannot work with broken acinclude.m4.
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$FGREP acinclude.m4 stderr
+
+rm -f acinclude.m4
 
 # Sanity checks: aclocal and automake cannot work with broken configure.in.
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
diff --git a/tests/help4.test b/tests/help4.test
index c5eb31e..1b7de41 100755
--- a/tests/help4.test
+++ b/tests/help4.test
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure --help and --version work, even when no configure.ac
-# is in the current directory.
+# Check that the first among --help and --version to be specified on
+# the command line takes precedence over the following one.
 
 . ./defs || Exit 1
 
diff --git a/tests/repeated-options.test b/tests/repeated-options.test
new file mode 100755
index 0000000..84901f8
--- /dev/null
+++ b/tests/repeated-options.test
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2010  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/>.
+
+# Check that automake does not complain on repeated options, nor
+# generate broken or incorrect makefiles.
+
+required=bzip2
+. ./defs || Exit 1
+
+set -e
+
+cat >configure.in <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip no-dist-gzip dist-bzip2])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = parallel-tests subdir-objects subdir-objects
+AUTOMAKE_OPTIONS += dist-bzip2 parallel-tests
+TESTS = foo.test
+EXTRA_DIST = $(TESTS)
+bin_PROGRAMS = sub/foo
+END
+
+mkdir sub
+
+cat > foo.test <<'END'
+#!/bin/sh
+test -f sub/foo && test -x sub/foo
+END
+chmod a+x foo.test
+
+cat > sub/foo.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
+cp $testsrcdir/../lib/compile .
+
+$ACLOCAL
+$AUTOMAKE --foreign --foreign -Wall 2>stderr || { cat stderr >&2; Exit 1; }
+test -s stderr && { cat stderr >&2; Exit 1; }
+rm -f stderr
+$AUTOCONF
+
+./configure
+$MAKE
+ls -l . sub
+test -f sub/foo.o
+test -f sub/foo
+$MAKE check
+ls -l
+test -f foo.log
+test -f test-suite.log
+$MAKE clean
+$MAKE distcheck
+ls -l
+test -f $me-1.0.tar.bz2
+test ! -r $me-1.0.tar.gz
+
+:


hooks/post-receive
-- 
GNU Automake