[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-114-g2f000a2

[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=2f000a293dd2517bb2ae2bcc05179065dc8e6593

The branch, ng/master has been updated
       via  2f000a293dd2517bb2ae2bcc05179065dc8e6593 (commit)
       via  f146280a9b35bbbbebfe93f9373f398b6a5bb69b (commit)
       via  fdf80a97edf2cc9b280a3effbe966915a5db77cc (commit)
       via  39b6b7020b31fed668f370cb5d10d45e7de09fa7 (commit)
       via  4c3cf98781f5aad3bacd2e435123ffe65284d0a2 (commit)
       via  5679da20482c59e76003ce14d92792652c44953f (commit)
       via  97f2a6db3379ffaa3a21ea590b09710dc25b264e (commit)
       via  41f418b0787c7b574fa702fb1f14546ada4eadc2 (commit)
      from  99d3c8ae43a45a820024407dd7c4a6ab6733b530 (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 2f000a293dd2517bb2ae2bcc05179065dc8e6593
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 18 19:19:19 2012 +0200

    [ng] tests: remove explicit GNU make requirements
    
    Issue reveled by a "make maintainer-check" failure.
    
    * t/vala-vapi.sh ($required): Drop 'GNUmake' requirement, which was
    causing the test to be spuriously skipped.
    * t/vala-libs.sh: Likewise.
    * t/vala-headers.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f146280a9b35bbbbebfe93f9373f398b6a5bb69b
Merge: 99d3c8a fdf80a9
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 18 19:12:49 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      hacking: fix typo
      maint: version bump after beta release
      Beta release 1.11d (will become 1.12)
      tests: remove redundant 'set -e' calls
      tests: avoid spurious failures when cross-compiling
      maintainer-check: fix definition of $(ams) again
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 HACKING                                    |    2 +-
 NEWS                                       |    4 ++--
 syntax-checks.mk                           |    2 +-
 t/aclocal-install-fail.sh                  |    2 --
 t/aclocal-install-mkdir.sh                 |    2 --
 t/aclocal-no-install-no-mkdir.sh           |    2 --
 t/aclocal-verbose-install.sh               |    2 --
 t/instdir-no-empty.sh                      |    2 --
 t/link_cond.sh                             |    2 --
 t/parallel-tests-recheck-depends-on-all.sh |    2 +-
 t/python-pr10995.sh                        |    2 --
 t/vala-headers.sh                          |    2 +-
 t/vala-libs.sh                             |    2 +-
 t/vala-vapi.sh                             |    8 +++-----
 t/yacc-basic.sh                            |    5 ++---
 t/yacc-cxx.sh                              |   12 +++++++-----
 16 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/HACKING b/HACKING
index c57da67..70e6f96 100644
--- a/HACKING
+++ b/HACKING
@@ -210,7 +210,7 @@
 * Use perl coverage information to ensure your new code is thoroughly
   tested by your new tests.
 
-* See file 'tests/README' for more information.
+* See file 't/README' for more information.
 
 ================================================================
 = Release procedure
diff --git a/NEWS b/NEWS
index bb2480f..0410158 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.11c:
+New in 1.11e:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -221,7 +221,7 @@ New in 1.11c:
     '-Wall'.  In previous versions, one has to use '-Wextra-portability'
     to enable them.
 
-Bugs fixed in 1.11c:
+Bugs fixed in 1.11e:
 
   - Various minor bugfixes for recent or long-standing bugs.
 
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 755c1ba..9d7681b 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -33,7 +33,7 @@ xtests := $(shell \
 
 xdefs = $(srcdir)/defs $(srcdir)/defs-static.in
 
-ams := $(shell find $(srcdir) '(' -name '*.dir' -prune ')' -o -name '*.am')
+ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print)
 
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
index c458239..fae2997 100755
--- a/t/aclocal-install-fail.sh
+++ b/t/aclocal-install-fail.sh
@@ -21,8 +21,6 @@ am_create_testdir=empty
 required=ro-dir
 . ./defs || Exit 1
 
-set -e
-
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
index 71d09af..ba4be2a 100755
--- a/t/aclocal-install-mkdir.sh
+++ b/t/aclocal-install-mkdir.sh
@@ -21,8 +21,6 @@
 am_create_testdir=empty
 . ./defs || Exit 1
 
-set -e
-
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
index 728e70a..3e685f0 100755
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/aclocal-no-install-no-mkdir.sh
@@ -20,8 +20,6 @@
 am_create_testdir=empty
 . ./defs || Exit 1
 
-set -e
-
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index d854719..099fff4 100755
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
@@ -19,8 +19,6 @@
 am_create_testdir=empty
 . ./defs || Exit 1
 
-set -e
-
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO_BAR
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
index 9251b13..cf519a0 100755
--- a/t/instdir-no-empty.sh
+++ b/t/instdir-no-empty.sh
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.ac <<'END'
 AC_SUBST([CC], [whatever])
 AC_SUBST([JAVAC], [whatever])
diff --git a/t/link_cond.sh b/t/link_cond.sh
index 6d1761a..9c120af 100755
--- a/t/link_cond.sh
+++ b/t/link_cond.sh
@@ -23,8 +23,6 @@
 required='cc c++'
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.ac << 'END'
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/t/parallel-tests-recheck-depends-on-all.sh 
b/t/parallel-tests-recheck-depends-on-all.sh
index cec66ae..6c9e4cb 100755
--- a/t/parallel-tests-recheck-depends-on-all.sh
+++ b/t/parallel-tests-recheck-depends-on-all.sh
@@ -18,7 +18,7 @@
 # See automake bug#11252.
 
 am_parallel_tests=yes
-required=cc
+required='cc native'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
index b21d38f..3efa5d0 100755
--- a/t/python-pr10995.sh
+++ b/t/python-pr10995.sh
@@ -21,8 +21,6 @@
 required=python
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.ac <<'EOF'
 AM_PATH_PYTHON
 AC_OUTPUT
diff --git a/t/vala-headers.sh b/t/vala-headers.sh
index ffb66d9..2dc4391 100755
--- a/t/vala-headers.sh
+++ b/t/vala-headers.sh
@@ -16,7 +16,7 @@
 
 # Test to make sure compiling Vala code really works with recursive make.
 
-required="pkg-config valac gcc GNUmake"
+required="pkg-config valac gcc"
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index fa1d21b..71ce3b3 100755
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -17,7 +17,7 @@
 # Building libraries (libtool and static) from Vala sources.
 # And use of vapi files to call C code from Vala.
 
-required="valac cc pkg-config libtoolize GNUmake"
+required="valac cc pkg-config libtoolize"
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index 7ad8742..df03247 100755
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -16,11 +16,9 @@
 
 # Test and that vapi files are correctly handled by Vala support.
 
-required='valac cc GNUmake'
+required='valac cc'
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.ac <<'END'
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -72,7 +70,7 @@ $MAKE
 ls -l        # For debugging.
 cat zardoz.c # Likewise.
 grep 'BARBAR' zardoz.c
-$MAKE test1
+cross_compiling || $MAKE test1 || Exit 1
 
 # Simple check on remake rules.
 $sleep
@@ -83,7 +81,7 @@ sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || 
Exit 99
 $MAKE
 cat zardoz.c # For debugging.
 grep 'BAZBAZ' zardoz.c
-$MAKE test2
+cross_compiling || $MAKE test2 || Exit 1
 
 # Check the distribution.
 $MAKE distcheck
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
index c8e0c91..8bc8c4b 100755
--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
@@ -70,12 +70,11 @@ test -f bar-parse.output
 if cross_compiling; then :; else
   echo a | ./foo
   echo b | ./foo && Exit 1
+  echo a | ./bar
+  echo b | ./bar && Exit 1
   : For shells with busted 'set -e'.
 fi
 
-echo a | ./bar
-echo b | ./bar && Exit 1
-
 # The Yacc-derived C sources must be shipped.
 $MAKE echo-distcom
 $MAKE -s echo-distcom | grep '[ /]parse\.c '
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index 499a3b9..80ac2ee 100755
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -88,11 +88,13 @@ test -f foo4-parse4.cpp
 test -f foo3-parse3.output
 test -f foo4-parse4.output
 
-for i in 1 2 3 4; do
-  echo a | ./foo$i
-  echo b | ./foo$i && Exit 1
-  : For shells with busted 'set -e'.
-done
+if cross_compiling; then :; else
+  for i in 1 2 3 4; do
+    echo a | ./foo$i
+    echo b | ./foo$i && Exit 1
+    : For shells with busted 'set -e'.
+  done
+fi
 
 # The Yacc-derived C++ sources must be shipped.
 $MAKE echo-distcom


hooks/post-receive
-- 
GNU Automake