[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1552-g75a11fa

[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=75a11fae8cd4833e121ca0df69ea12796a8a1436

The branch, testsuite-work has been updated
       via  75a11fae8cd4833e121ca0df69ea12796a8a1436 (commit)
       via  68462b1b33810bfe29684fb2163d9dd9ae37e90c (commit)
       via  eea57793c7dde8b836ff1e6f8e232747a85b5dba (commit)
      from  eb52380d7a7bbedcd10fb9991420ae25ea27520f (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 75a11fae8cd4833e121ca0df69ea12796a8a1436
Merge: eb52380 68462b1
Author: Stefano Lattarini <address@hidden>
Date:   Sat Nov 5 21:39:54 2011 +0100

    Merge branch 'master' into testsuite-work
    
    * master:
      ar-lib: fix configure output for "unrecognized archiver interface"

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

Summary of changes:
 ChangeLog      |   10 ++++++++++
 m4/ar-lib.m4   |    7 +++++--
 tests/ar4.test |    8 ++++++--
 tests/ar5.test |   13 +++++++++++--
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2269ed7..433c3f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-11-05  Stefano Lattarini  <address@hidden>
 
+       ar-lib: fix configure output for "unrecognized archiver interface"
+       * m4/ar-lib.m4: Ensure that, even when an error is hit while trying
+       to determine the archiver interface kind, the "checking archiver
+       interface" message from configure is properly terminated before
+       an error message is printed, to avoid slightly garbled output.
+       * tests/ar4.test: Enhance.
+       * tests/ar5.test: Likewise.
+
+2011-11-05  Stefano Lattarini  <address@hidden>
+
        tests: more faithful 'installcheck' support in few tests
        * tests/ar-lib5a.test: Use the `$am_scriptdir' variable instead
        of "$testsrcdir/../lib" or "$top_testsrcdir/lib", to test more
diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4
index 822ca60..e45c558 100644
--- a/m4/ar-lib.m4
+++ b/m4/ar-lib.m4
@@ -33,8 +33,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], 
[am_cv_ar_interface],
         if test "$ac_status" -eq 0; then
           am_cv_ar_interface=lib
         else
-          m4_default([$1],
-            [AC_MSG_ERROR([could not determine $AR interface])])
+          am_cv_ar_interface=unknown
         fi
       fi
       rm -f conftest.lib libconftest.a
@@ -53,6 +52,10 @@ lib)
   # similar.
   AR="$am_aux_dir/ar-lib $AR"
   ;;
+unknown)
+  m4_default([$1],
+             [AC_MSG_ERROR([could not determine $AR interface])])
+  ;;
 esac
 AC_SUBST([AR])dnl
 ])
diff --git a/tests/ar4.test b/tests/ar4.test
index 60db9e7..2faeeed 100755
--- a/tests/ar4.test
+++ b/tests/ar4.test
@@ -25,9 +25,13 @@ END
 $ACLOCAL
 $AUTOCONF
 
-./configure AR=/bin/false 2>stderr && { cat stderr >&2; Exit 1; }
+st=0; ./configure AR=/bin/false >stdout 2>stderr || st=$?
+cat stdout
 cat stderr >&2
+test $st -eq 1
 
-grep 'configure: error: could not determine /bin/false interface' stderr
+grep '^checking.* archiver .*interface.*\.\.\. unknown' stdout
+grep '^configure: error: could not determine /bin/false interface' stderr
+ls *conftest* && Exit 1
 
 :
diff --git a/tests/ar5.test b/tests/ar5.test
index 8908ca7..000daa7 100755
--- a/tests/ar5.test
+++ b/tests/ar5.test
@@ -19,13 +19,22 @@
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
-AM_PROG_AR([echo spy > bad-archiver-interface-detected])
+AM_PROG_AR([
+  echo spy > bad-archiver-interface-detected
+  AC_MSG_CHECKING([for something else])
+  AC_MSG_RESULT([found it])
+  echo Grep This
+])
 END
 
 $ACLOCAL
 $AUTOCONF
 
-./configure AR=/bin/false
+./configure AR=/bin/false >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^checking.* archiver .*interface.*\.\.\. unknown$' stdout
+grep '^checking for something else\.\.\. found it$' stdout
+grep '^Grep This$' stdout
 test -f bad-archiver-interface-detected
 
 :


hooks/post-receive
-- 
GNU Automake