From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 5 Nov 2011 20:39:54 +0000 (+0100)
Subject: Merge branch 'master' into testsuite-work
X-Git-Tag: ng-0.5a~89^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75a11fae8cd4833e121ca0df69ea12796a8a1436;p=thirdparty%2Fautomake.git

Merge branch 'master' into testsuite-work

* master:
  ar-lib: fix configure output for "unrecognized archiver interface"
---

75a11fae8cd4833e121ca0df69ea12796a8a1436
diff --cc ChangeLog
index 2269ed7f1,443e15e61..433c3f88a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,59 -1,13 +1,69 @@@
+ 2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	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  <stefano.lattarini@gmail.com>
 +
 +	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
 +	faithfully under "make installcheck".
 +	* tests/ar-lib5a.test: Likewise.
 +	* tests/libobj-basic.test: Likewise.
 +	* tests/libobj19.test: Likewise.
 +	* tests/suffix5.test: Likewise.
 +
 +2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: remove redundant settings of `errexit' shell flag
 +	* tests/aclocal-path-install-serial.test: Do not set the
 +	`errexit' shell flag, as it is already set by `tests/defs'.
 +	* tests/ar-lib2.test: Likewise.
 +	* tests/ar-lib3.test: Likewise.
 +	* tests/ar-lib4.test: Likewise.
 +	* tests/ar-lib5a.test: Likewise.
 +	* tests/ar-lib5b.test: Likewise.
 +	* tests/ar-lib6a.test: Likewise.
 +	* tests/ar-lib6b.test: Likewise.
 +	* tests/ar-lib7.test: Likewise.
 +	* tests/ar3.test: Likewise.
 +	* tests/ar4.test: Likewise.
 +	* tests/ar5.test: Likewise.
 +	* tests/extra-portability.test: Likewise.
 +	* tests/extra-portability2.test: Likewise.
 +	* tests/extra-portability3.test: Likewise.
 +	* tests/install-info-dir.test: Likewise.
 +	* tests/maintmode-configure-msg.test: Likewise.
 +
 +2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	generated tests: avoid extra "FIXME" comments
 +	* tests/gen-testsuite-part: Avoid putting too much "FIXME"
 +	comments in the generated test scripts, since they end up
 +	being just counter-productive noise when one has to grep
 +	the test scripts looking for real "FIXME" items.
 +
 +2011-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	cosmetics: fix typo in 'prove-runner' script
 +	* tests/prove-runner: Remove erroneously-repeated word.
 +	* THANKS: Update.
 +	Reported by Dave Hart.
 +
 +2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Merge branch 'master' into testsuite-work
 +	* tests/extra-portability.test: Use `$am_original_AUTOMAKE'
 +	instead of the obsolete `$original_AUTOMAKE'.
 +	* tests/extra-portability3.test: Likewise.
 +	* tests/list-of-tests.mk: Update.
 +
  2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	Merge branch 'msvc' into master
diff --cc tests/ar5.test
index 8908ca7df,865e0bf81..000daa7be
--- a/tests/ar5.test
+++ b/tests/ar5.test
@@@ -18,8 -18,15 +18,13 @@@
  
  . ./defs || Exit 1
  
 -set -e
 -
  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