[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11b-41-g39b6b70

[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=39b6b7020b31fed668f370cb5d10d45e7de09fa7

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

    maint: version bump after beta release
    
    * configure.ac (AC_INIT): Bump version number to 1.11e, as per
    HACKING suggestion.
    * NEWS: Likewise.
    * m4/amversion.m4: Likewise (autoupdated by ./bootstrap).
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 4c3cf98781f5aad3bacd2e435123ffe65284d0a2
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 18 18:19:05 2012 +0200

    Beta release 1.11d (will become 1.12)
    
    * configure.ac (AC_INIT): Bump version number to 1.11d.
    * NEWS: Likewise.
    * m4/amversion.m4: Likewise (autoupdated by ./bootstrap).
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 5679da20482c59e76003ce14d92792652c44953f
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 18 18:09:58 2012 +0200

    tests: remove redundant 'set -e' calls
    
    * t/aclocal-install-fail.sh: Do not set the 'errexit' shell flag,
    as it is already set by './defs'.
    * t/aclocal-install-mkdir.sh: Likewise.
    * t/aclocal-no-install-no-mkdir.sh: Likewise.
    * t/aclocal-verbose-install.sh: Likewise.
    * t/instdir-no-empty.sh: Likewise.
    * t/link_cond.sh: Likewise.
    * t/python-pr10995.sh: Likewise.
    * t/vala-vapi.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 97f2a6db3379ffaa3a21ea590b09710dc25b264e
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 18 18:04:12 2012 +0200

    tests: avoid spurious failures when cross-compiling
    
    * t/parallel-tests-recheck-depends-on-all.sh: Skip the test
    when cross-compiling.
    * t/vala-vapi.sh: Skip tests that do not make sense when
    cross-compiling.
    * t/yacc-basic.sh: Likewise.
    * t/yacc-cxx.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS                                       |    4 ++--
 configure.ac                               |    2 +-
 m4/amversion.m4                            |    6 +++---
 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-vapi.sh                             |    6 ++----
 t/yacc-basic.sh                            |    5 ++---
 t/yacc-cxx.sh                              |   12 +++++++-----
 14 files changed, 18 insertions(+), 33 deletions(-)

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/configure.ac b/configure.ac
index f4582d2..0aa9c26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.68])
-AC_INIT([GNU Automake], [1.11c], address@hidden)
+AC_INIT([GNU Automake], [1.11e], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 0b45aeb..15c6dcb 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -14,10 +14,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11c'
+[am__api_version='1.11e'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11c], [],
+m4_if([$1], [1.11e], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -33,7 +33,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11c])dnl
+[AM_AUTOMAKE_VERSION([1.11e])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
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 6f105c0..d93add8 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 7b9fd5a..71733ba 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-vapi.sh b/t/vala-vapi.sh
index 7ad8742..3a92716 100755
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -19,8 +19,6 @@
 required='valac cc GNUmake'
 . ./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 71a17e5..d2fd490 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 fe348cb..2af22ee 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