From: Stefano Lattarini Date: Thu, 3 Nov 2011 15:23:56 +0000 (+0100) Subject: Merge branch 'tw-merge-master' into testsuite-work X-Git-Tag: ng-0.5a~89^2~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8847af0bdaf45429ce32ac13f4201073ffe0d6ee;p=thirdparty%2Fautomake.git Merge branch 'tw-merge-master' into testsuite-work --- 8847af0bdaf45429ce32ac13f4201073ffe0d6ee diff --cc ChangeLog index d493ba333,2f5407d2a..4e1efcca2 --- a/ChangeLog +++ b/ChangeLog @@@ -1,19 -1,198 +1,214 @@@ + 2011-11-03 Stefano Lattarini + + Merge branch 'master' into testsuite-work + + * tests/instspc.tap: Adjust to new portability requirements + due to the new AM_PROG_AR macro. + * tests/lex-lib.test: Likewise. + * tests/extra-portability2.test: Use `$am_original_AUTOMAKE' + instead of the obsolete `$original_AUTOMAKE'. + * tests/list-of-tests.mk: Update. + + 2011-11-03 Stefano Lattarini + + tests: various minor tweakings, mostly related to AM_PROG_AR + * tests/alloca.test: Adjust to new portability requirements due + to the new AM_PROG_AR macro. + * tests/discover.test: Likewise. + * tests/libobj3.test: Likewise. + * tests/pluseq7.test: Likewise. Also, make grepping of automake + expected error message stricter. + * tests/stdlib.test: Likewise, and extend the test a bit. + * tests/parse.test (configure.in): Remove redundant call to + AC_PROG_RANLIB. + * tests/library2.test: Adjust to new portability requirements + due to the new AM_PROG_AR macro. Also ... + (configure.in): ... add call to AC_PROG_CC, to ensure automake + really fails for the expected reason. + + 2011-11-03 Stefano Lattarini + + Merge branch 'msvc' into master + + * tests/instspc-tests.sh: Adjust to new portability requirements + due to the new AM_PROG_AR macro. + * tests/libobj-basic.test: Likewise. + * tests/libobj2.test: Likewise. + * tests/libobj15a.test: Likewise. + * tests/libobj15b.test: Likewise. + * tests/libobj15c.test: Likewise. + * tests/libobj16a.test: Likewise. + * tests/libobj16b.test: Likewise. + * tests/libobj17.test: Likewise. + * tests/libobj18.test: Likewise. + * tests/libobj19.test: Likewise. + * tests/libobj20a.test: Likewise. + * tests/libobj20b.test: Likewise. + * tests/libobj20c.test: Likewise. + * tests/canon6.test: Likewise. + * tests/canon6.test: Likewise. + * tests/canon7.tests: Likewise. + * tests/extra9.test: Likewise. + * tests/extradep.test: Likewise. + * tests/extradep2.test: Likewise. + * tests/posixsubst-ldadd.test: Likewise. + * tests/posixsubst-libraries.test: Likewise. + * tests/posixsubst-ltlibraries.test: Likewise. + * tests/python-virtualenv.test: Likewise. + * tests/vartypos.test: Likewise. + * tests/vartypo2.test: Likewise. + * tests/suffix.test: Update to take into account previous + master-only changes. + * tests/suffix2.test: Likewise. + * tests/libobj7.test: Call automake with the `--add-missing' + option, instead of creating a dummy `ar-lib' file, since this + test now also runs "./configure" and "make". + * tests/suffix5.test: Copy the real `ar-lib' script file, + instead of creating a dummy one, since this test now also + runs "./configure" and "make". + * tests/extra-portability2.test: Fix this test not to rely + on the older, faulty semantics of "strictness specification + always reset warning level", which has been fixed in commit + v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547). + Since we are at it, throw inf few other minor unrelated + improvements. + * tests/extra-portability.test: Explicitly pass `-Wall' to + automake calls, for clarity. + + 2011-10-21 Peter Rosin + + warnings: new 'extra-portability' category, for AM_PROG_AR + * lib/Automake/ChannelDefs.pm: Register new extra-portability + warning channel. + (switch_warning): Turn off extra-portability if portability is + turned off, and turn on portability if extra-portability is + turned on. + (set_strictness): Silence extra-portability for --gnits, --gnu + and --foreign. + * tests/extra-portability2.test: New test, checking that the + extra-portability channel is silenced by --gnits, --gnu and + --foreign. + * doc/automake.texi (Invoking Automake): Document the new warning + category and its interaction with the portability category. + * tests/extra-portability.test: New test, checking the interaction + between the portability and extra-portability warning categories. + * automake.in (handle_libraries, handle_ltlibraries): Move the + AM_PROG_AR warnings to the new extra-portability channel. + * tests/ar2.test: Adjust to the new warning channel. + * tests/pr300-lib.test: Likewise. + * tests/pr300-ltlib.test: Likewise. + * tests/pr307.test: Likewise. + * tests/pr401.test: Likewise. + * tests/pr401b.test: Likewise. + * tests/pr401c.test: Likewise. + * tests/pr72.test: Likewise. + * NEWS: Likewise. + * tests/Makefile.am (TESTS): Update. + + 2011-10-21 Peter Rosin + Ralf Wildenhues + Stefano Lattarini + + Add new 'AM_PROG_AR' macro, triggering the 'ar-lib' script. + * m4/ar-lib.m4: New macro AM_PROG_AR, which locates an + archiver and triggers the auxiliary 'ar-lib' script if needed. + * m4/Makefile.am (dist_m4data_DATA): Update. + * automake.in ($seen_ar): New variable. + (scan_autoconf_traces): Set it. + (handle_libraries, handle_ltlibraries): Require AM_PROG_AR for + portability. + * doc/automake.texi (Public Macros): Mention the new + 'AM_PROG_AR' macro. + (Subpackages): Add AM_PROG_AR to the example. + (A Library): Adjust recommendations for AR given the new + AM_PROG_AR macro. + * All relevant tests: Adjust to new portability requirements due + to the new AM_PROG_AR macro. + * tests/ar-lib2.test: New test, checking that AM_PROG_AR triggers + install of ar-lib. + * tests/ar-lib3.test: New test, checking that lib_LIBRARIES + requires AM_PROG_AR. + * tests/ar-lib4.test: New test, checking that lib_LTLIBRARIES + requires AM_PROG_AR. + * tests/ar-lib5a.test: New test, checking that AM_PROG_AR triggers + use of ar-lib when the archiver is Microsoft lib. + * tests/ar-lib5b.test: New test, checking that AM_PROG_AR triggers + use of ar-lib when the archiver is a faked lib. + * tests/ar-lib6a.test: New test, checking the ordering of + AM_PROG_AR and LT_INIT. + * tests/ar-lib6b.test: New test, checking the ordering of + AM_PROG_AR and AC_PROG_LIBTOOL. + * tests/ar-lib7.test: New test, checking that automake warns + if ar-lib is missing. + * tests/ar3.test: New test, checking that AR and ARFLAGS may + be overridden by the user even if AM_PROG_AR is used. + * tests/ar4.test: New test, checking that AM_PROG_AR bails out + if it cannot determine the archiver interface. + * tests/ar5.test: New test, checking that AM_PROG_AR runs its + optional argument if it cannot determine the archiver interface. + * tests/defs.in: New required entry 'lib'. + * tests/Makefile.am (TESTS): Update. + * NEWS: Update. + + 2011-11-03 Zack Weinberg (tiny change) + Stefano Lattarini + + maint-mode: fix botched configure messages + This change fixes automake bug#9890. + * m4/maintainer.m4 (AM_MAINTAINER_MODE): Fix the "checking ..." + configure message related to the enabling/disabling of maintainer + mode. + * tests/help-maintainer.test: Renamed ... + * tests/maintmode-configure-msg.test: ... to this, and extended + to cover the fixed bug. Also, since we are at it, make grepping + of configure help screens stricter, and throw in some few other + changes to reduce code duplication and enhance readability. + * tests/Makefile.am (TESTS): Update. + * THANKS: Update with Zack's new e-mail address. + Report and initial patch by Zack Weinberg, test cases added by + Stefano Lattarini. + + 2011-10-23 Stefano Lattarini + + info: allow user to inhibit creation/update of '${infodir}/dir' + With this change, we allow the user to request the install-info + rules not to update the `${infodir}/dir' file, by exporting the + environment variable `AM_UPDATE_INFO_DIR' to the value "no". + This is especially useful to distro packagers, and is a definite + improvement over our previous hack of looking whether the + `install-info' program was the Debian or GNU version -- hack + which had been silently broken with recent versions of debian + install-info BTW (probably since dpkg 1.15.4, 2009-09-06). + This change fixes automake bug#9773. See also Debian Bug#543992. + * lib/am/texinfos.am: Don't look anymore at the output of + `install-info --version' to decide whether to use it to update + the `${infodir}/dir' or not; instead, honour the environment + variable `AM_UPDATE_INFO_DIR'. + * tests/install-info-dir.test: New test. + * tests/Makefile.am (TESTS): Add it. + * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted + interferences from the environment. + * doc/automake.texi (Texinfo): Update. + * NEWS: Likewise. + * THANKS: Likewise. + Report by Jonathan Nieder. + +2011-10-25 Stefano Lattarini + + test defs: new function 'am_keeping_testdirs', for better APIs + + This change is meant to make it easier for TAP-based test scripts + to remove files left over by completed (sub)tests, while still + honoring the user-provided `$keep_testdirs' setting. + + * tests/defs (am_keeping_testdirs): New function, telling whether + we should keep the test directories around, even in case of + success (by default, we don't). + (exit trap): Use it. + * tests/depmod.tap: Likewise. + * tests/instspc.tap: Likewise. Also, fix some pre-existing + "copy & paste" bugs, and a typo in comments. + 2011-10-25 Stefano Lattarini tests: remove redundant `set -e', and other minor improvements