[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1110-ge79b1bf

[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=e79b1bf3d8fa33bb4e2d4d3b6c4b1f90dd65ea40

The branch, master has been updated
       via  e79b1bf3d8fa33bb4e2d4d3b6c4b1f90dd65ea40 (commit)
       via  005000e7a47e75d051473ad326983be6448738b6 (commit)
      from  38e1b39d77ad4a22c85d5ad7b2fde4fd51bfd1b5 (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 e79b1bf3d8fa33bb4e2d4d3b6c4b1f90dd65ea40
Merge: 38e1b39 005000e
Author: Stefano Lattarini <address@hidden>
Date:   Thu Nov 3 15:23:22 2011 +0100

    Merge branch 'msvc'
    
    * msvc:
      tests: various minor tweakings, mostly related to AM_PROG_AR

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

Summary of changes:
 ChangeLog           |   17 +++++++++++++++++
 tests/alloca.test   |    2 ++
 tests/discover.test |    2 ++
 tests/libobj3.test  |    3 +++
 tests/library2.test |    6 +++++-
 tests/pluseq7.test  |    5 +++--
 tests/stdlib.test   |   22 ++++++++++++++++++++--
 7 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b79cae0..7363e1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2011-11-03  Stefano Lattarini  <address@hidden>
 
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca.test: Adjust to new portability requirements due
+       to the new AM_PROG_AR macro.
+       * tests/discover.test: Likewise.
+       * tests/libobj3.test: Likewise.
+       * tests/pluseq7.test: Likewise.  Also, make grepping of automake
+       expected error message stricter.
+       * tests/stdlib.test: Likewise, and extend the test a bit.
+       * tests/parse.test (configure.in): Remove redundant call to
+       AC_PROG_RANLIB.
+       * tests/library2.test: Adjust to new portability requirements
+       due to the new AM_PROG_AR macro.  Also ...
+       (configure.in): ... add call to AC_PROG_CC, to ensure automake
+       really fails for the expected reason.
+
+2011-11-03  Stefano Lattarini  <address@hidden>
+
        Merge branch 'msvc' into master
 
        * tests/instspc-tests.sh: Adjust to new portability requirements
diff --git a/tests/alloca.test b/tests/alloca.test
index cff6641..947a5b4 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -19,6 +19,7 @@
 . ./defs || Exit 1
 
 cat >> configure.in <<'END'
+AM_PROG_AR
 AC_PROG_CC
 END
 
@@ -29,6 +30,7 @@ libtu_a_LIBADD = @ALLOCA@
 END
 
 : > alloca.c
+: > ar-lib
 
 $ACLOCAL
 AUTOMAKE_fails
diff --git a/tests/discover.test b/tests/discover.test
index e54daff..5108265 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -21,6 +21,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_RANLIB
+AM_PROG_AR
 AC_PROG_CC
 AC_LIBOBJ([fsusage])
 AC_OUTPUT
@@ -33,6 +34,7 @@ libtu_a_LIBADD = @LIBOBJS@
 END
 
 : > fsusage.c
+: > ar-lib
 
 $ACLOCAL
 AUTOMAKE_fails
diff --git a/tests/libobj3.test b/tests/libobj3.test
index 04d4405..10686f4 100755
--- a/tests/libobj3.test
+++ b/tests/libobj3.test
@@ -22,6 +22,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_RANLIB
+AM_PROG_AR
 END
 
 cat > Makefile.am << 'END'
@@ -30,6 +31,8 @@ libtu_a_SOURCES =
 libtu_a_LIBADD = @LIBOBJS@
 END
 
+: > ar-lib
+
 $ACLOCAL
 AUTOMAKE_fails
 grep 'Makefile\.am:3:.*LIBOBJS' stderr
diff --git a/tests/library2.test b/tests/library2.test
index 69f387a..7bd3e62 100755
--- a/tests/library2.test
+++ b/tests/library2.test
@@ -18,10 +18,14 @@
 
 . ./defs || Exit 1
 
+cat >> configure.in << 'END'
+AC_PROG_CC
+END
+
 cat > Makefile.am << 'END'
 EXTRA_LIBRARIES = libfoo.a
 END
 
 $ACLOCAL
-AUTOMAKE_fails
+AUTOMAKE_fails -Wno-portability
 grep AC_PROG_RANLIB stderr
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index 3322a54..f8ceefa 100755
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -32,7 +32,8 @@ AR += qq
 END
 
 $ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:3:.*AR' stderr
+AUTOMAKE_fails -Wno-portability
+q="[\`'\"]"
+grep "^Makefile\.am:3:.* AR .* with $q=$q before .*$q+=$q" stderr
 
 :
diff --git a/tests/stdlib.test b/tests/stdlib.test
index edd68b0..0d986da 100755
--- a/tests/stdlib.test
+++ b/tests/stdlib.test
@@ -21,15 +21,33 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_AR
 AC_PROG_RANLIB
 END
 
 cat > Makefile.am << 'END'
 noinst_LIBRARIES = sub/foo
+include $(srcdir)/foo.mk
 END
 
+cat > foo.mk << 'END'
+## A dummy automake comment.
+a = x \
+    y
+# A dummy make comment.
+lib_LIBRARIES = zardoz.a
+END
+
+: > ar-lib
+
 $ACLOCAL
 AUTOMAKE_fails
+q="[\`'\"]"
+badname='not a standard library name'
 # We're specifically testing for line-number information.
-grep 'Makefile.am:1:.*sub/foo.*standard library name' stderr
-grep 'Makefile.am:1:.*sub/libfoo.a.*' stderr
+grep "^Makefile\\.am:1:.*${q}sub/foo${q}.*$badname" stderr
+grep "^Makefile\\.am:1:.*sub/libfoo\\.a" stderr
+grep "^foo\\.mk:5:.*${q}zardoz\\.a${q}.*$badname" stderr
+grep "^foo\\.mk:5:.*libzardoz\\.a" stderr
+
+:


hooks/post-receive
-- 
GNU Automake