[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-623-gc62bac6

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

The branch, master has been updated
       via  c62bac667b522af9bf8b05175278e67e9b073d09 (commit)
       via  2525b56bdeebf8327c49b921b7a1fefaed45d087 (commit)
       via  63c34882ee4216d688f47d8f357d0a75e87fc521 (commit)
      from  0e444f5394c435dc55a9ba061224b6a6040042f9 (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 c62bac667b522af9bf8b05175278e67e9b073d09
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 12:40:02 2011 +0100

    tests: explain MSYS setup failure issue, improve test.
    
    * tests/defs: Add comment and failure message, improve fail
    logic.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 2525b56bdeebf8327c49b921b7a1fefaed45d087
Merge: 0e444f5 63c3488
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 13:06:21 2011 +0100

    Merge branch 'fix-libobj-tests'
    
    * fix-libobj-tests:
      Fix libobj2.test failure with non-GNU make: define $(AR).

commit 63c34882ee4216d688f47d8f357d0a75e87fc521
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 11:54:54 2011 +0100

    Fix libobj2.test failure with non-GNU make: define $(AR).
    
    * tests/libobj2.test: Ensure $(AR) is suitably defined.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog          |   12 ++++++++++++
 tests/defs         |    6 ++++--
 tests/libobj2.test |    1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a1f6f1..b70b607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
 2011-01-15  Ralf Wildenhues  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       tests: explain MSYS setup failure issue, improve test.
+       * tests/defs: Add comment and failure message, improve fail
+       logic.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       Fix libobj2.test failure with non-GNU make: define $(AR).
+       * tests/libobj2.test: Ensure $(AR) is suitably defined.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
 
        tests: avoid spurious failures due to fork failure in test setup
        * tests/defs: Ensure $me is always nonempty, to avoid spurious
diff --git a/tests/defs b/tests/defs
index 0f84d0a..b357df6 100644
--- a/tests/defs
+++ b/tests/defs
@@ -31,8 +31,10 @@ test -f ./defs-static || {
 . ./defs-static || exit 99
 
 # The name of the current test (without the `.test' suffix.)
-me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'`
-test -n "$me" || exit 99
+# Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
+me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'` \
+  && test -n "$me" \
+  || { echo "$argv0: failed to define \$me" >&2; exit 99; }
 
 
 ## ---------------------------------------- ##
diff --git a/tests/libobj2.test b/tests/libobj2.test
index 3b3ec98..66ca0d0 100755
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -24,6 +24,7 @@ cat >> configure.in << 'END'
 AC_CONFIG_FILES([subdir/Makefile])
 AC_PROG_CC
 AC_PROG_RANLIB
+AC_CHECK_TOOLS([AR], [ar])
 AC_LIBOBJ([fsusage])
 AC_OUTPUT
 END


hooks/post-receive
-- 
GNU Automake