[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-4-g917e1e8

[Ralf Wildenhues]

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=917e1e8946e964c71370f89445c758c000457658

The branch, branch-1.11 has been updated
       via  917e1e8946e964c71370f89445c758c000457658 (commit)
       via  23aa3dbbf5d5a28a33604599eb4f848f293e9933 (commit)
       via  c87d38b4db0e899509bc9a0e6a659f0f4a67bc6a (commit)
      from  2c691754f3afaf4d4f5d3a11a08aa1e68c429b6e (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 917e1e8946e964c71370f89445c758c000457658
Merge: 2c691754f3afaf4d4f5d3a11a08aa1e68c429b6e 
23aa3dbbf5d5a28a33604599eb4f848f293e9933
Author: Ralf Wildenhues <address@hidden>
Date:   Mon May 18 23:03:45 2009 +0200

    Merge branch 'maint' into branch-1.11

commit 23aa3dbbf5d5a28a33604599eb4f848f293e9933
Author: Ralf Wildenhues <address@hidden>
Date:   Mon May 18 20:57:05 2009 +0200

    testsuite: also try `jot' as `seq' replacement.
    
    * tests/instmany-mans.test: Try BSD `jot' before resorting to a
    slow but portable shell loop.
    * tests/instmany-python.test: Likewise.
    * tests/instmany.test: Likewise.
    Suggestion by Peter O'Gorman.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit c87d38b4db0e899509bc9a0e6a659f0f4a67bc6a
Author: Ralf Wildenhues <address@hidden>
Date:   Mon May 18 20:52:59 2009 +0200

    Fix test failure when pkg.m4 is not found, only pkg-config.
    
    * tests/vala5.test: Update comment, this test is not expected to
    fail any more.  Require valac version 0.7.0.  Skip if configure
    fails, could be due to unexpanded PKG_CHECK_MODULES or too old
    valac.
    Report by Simon Josefsson.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                  |   16 ++++++++++++++++
 tests/instmany-mans.test   |    6 +++---
 tests/instmany-python.test |    4 ++--
 tests/instmany.test        |    6 +++---
 tests/vala5.test           |    6 +++---
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73152ad..7967f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-05-18  Ralf Wildenhues  <address@hidden>
+
+       testsuite: also try `jot' as `seq' replacement.
+       * tests/instmany-mans.test: Try BSD `jot' before resorting to a
+       slow but portable shell loop.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       Suggestion by Peter O'Gorman.
+
+       Fix test failure when pkg.m4 is not found, only pkg-config.
+       * tests/vala5.test: Update comment, this test is not expected to
+       fail any more.  Require valac version 0.7.0.  Skip if configure
+       fails, could be due to unexpanded PKG_CHECK_MODULES or too old
+       valac.
+       Report by Simon Josefsson.
+
 2009-05-17  Ralf Wildenhues  <address@hidden>
 
        Post-release version bump.
diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test
index 3ba8334..5fafa67 100755
--- a/tests/instmany-mans.test
+++ b/tests/instmany-mans.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009  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
@@ -31,8 +31,8 @@ limit=2500
 subdir=long_subdir_name_with_many_characters
 nfiles=81
 
-# Let's use `seq' if available, it's faster than the loop.
-list=`(seq 1 $nfiles) 2>/dev/null || {
+# Let's use `seq' or `jot' if available, they are faster than the loop.
+list=`(seq 1 $nfiles) 2>/dev/null || (jot $nfiles) 2>/dev/null || {
   i=1
   while test $i -le $nfiles; do
     echo $i
diff --git a/tests/instmany-python.test b/tests/instmany-python.test
index d55af0f..9407948 100755
--- a/tests/instmany-python.test
+++ b/tests/instmany-python.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009  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
@@ -27,7 +27,7 @@ limit=2500
 subdir=long_subdir_name_with_many_characters
 nfiles=81
 
-list=`(seq 1 $nfiles) 2>/dev/null || {
+list=`(seq 1 $nfiles) 2>/dev/null || (jot $nfiles) 2>/dev/null || {
   i=1
   while test $i -le $nfiles; do
     echo $i
diff --git a/tests/instmany.test b/tests/instmany.test
index aabeb7b..e423710 100755
--- a/tests/instmany.test
+++ b/tests/instmany.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009  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
@@ -39,8 +39,8 @@ limit=2500
 subdir=long_subdir_name_with_many_characters
 nfiles=81
 
-# Let's use `seq' if available, it's faster than the loop.
-list=`(seq 1 $nfiles) 2>/dev/null || {
+# Let's use `seq' or `jot' if available, they are faster than the loop.
+list=`(seq 1 $nfiles) 2>/dev/null || (jot $nfiles) 2>/dev/null || {
   i=1
   while test $i -le $nfiles; do
     echo $i
diff --git a/tests/vala5.test b/tests/vala5.test
index 172a50f..8fc703c 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -19,7 +19,7 @@
 # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-# Test per-target flags, expected to fail.
+# Test per-target flags.
 
 required="libtool libtoolize pkg-config valac gcc GNUmake"
 . ./defs || Exit 1
@@ -32,7 +32,7 @@ cat >> 'configure.in' << 'END'
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
-AM_PROG_VALAC
+AM_PROG_VALAC([0.7.0])
 PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
 AC_CONFIG_FILES([src/Makefile])
 AC_OUTPUT
@@ -69,6 +69,6 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-./configure
+./configure || Exit 77
 $MAKE
 


hooks/post-receive
-- 
GNU Automake