]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'msvc'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 1 Jan 2012 18:44:24 +0000 (19:44 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 1 Jan 2012 18:44:24 +0000 (19:44 +0100)
* msvc:
  tests: fix spurious failure due to autom4te caching
  news: fix suboptimal wording
  tests: various minor tweakings, mostly related to AM_PROG_AR

1  2 
ChangeLog.11
tests/alloca2.test
tests/ar-lib3.test
tests/ldadd.test
tests/libtool4.test
tests/pr211.test
tests/reqd2.test
tests/syntax.test

diff --cc ChangeLog.11
index cd60419a0688ee8da7289fefb4a4e9f63b197fa5,ba4373440e96d4955a99affefe378434bf870889..50b37ec97e9dce1d254ae0c9f9a67713bcd24066
        Yikes.  Cater to this incompatibility, by relaxing the test when
        a faulty `rm' is detected.
  
+ 2011-11-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca2.test: Ensure we don't experience a spurious failure
+       due to a missing `AM_PROG_AR' macro or a missing `ar-lib' auxiliary
+       script.
+       * tests/libtool4.test: Likewise.
+       * tests/ldadd.test: Likewise.  Since we are at it, make grepping of
+       automake stderr stricter.
+       * tests/reqd2.test: Likewise.
+       * tests/pr211.test: Ensure automake fails also with `-Wnone', since
+       the error we are testing for is an hard error, not a mere warning.
+       * tests/syntax.test: Likewise, and ensure we don't fail to other
+       errors by removing use of `lib_LTLIBRARIES' in Makefile.am.  Since
+       we are at it, make grepping of automake stderr stricter.
+ 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-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       warnings: fix buglets for portability warnings
+       * lib/Automake/ChannelDefs.pm (switch_warning): Ensure the
+       correct implications and inter-dependencies between warnings
+       in the categories `portability', `extra-portability' and
+       `recursive-portability' are respected.  Also add detailed
+       explicative comments, and references to the relevant tests.
+       * tests/dollarvar2.test: Update and extend.  Also, remove
+       some unnecessary uses of `--force' option in automake calls.
+       * tests/extra-portability3.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+ 2011-11-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       tests: extend tests on 'extra-portability' warning category
+       * tests/extra-portability.test: Redefine `$AUTOMAKE' to ensure we
+       have complete control over the automake options.  Extend by using
+       also a setup where no `portability' warning is present (only an
+       `extra-portability' warning is).  Other minor extensions.  Remove
+       some redundant, verbose comments about the expected diagnostic.
+ 2011-11-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       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-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
 +      * tests/extra-portability3.test: Use `$original_AUTOMAKE' instead
 +      of hackishly extracting the first component of `$AUTOMAKE'.
 +      * tests/extra-portability.test: Likewise.  Also, since we are at
 +      it, throw in a couple of small extensions and tweakings (suggested
 +      by the minor merge conflicts).
 +
 +2011-11-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      warnings: fix buglets for portability warnings
 +      * lib/Automake/ChannelDefs.pm (switch_warning): Ensure the
 +      correct implications and inter-dependencies between warnings
 +      in the categories `portability', `extra-portability' and
 +      `recursive-portability' are respected.  Also add detailed
 +      explicative comments, and references to the relevant tests.
 +      * tests/dollarvar2.test: Update and extend.  Also, remove
 +      some unnecessary uses of `--force' option in automake calls.
 +      * tests/extra-portability3.test: New test.
 +      * tests/Makefile.am (TESTS): Add it.
 +
 +2011-11-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: extend tests on 'extra-portability' warning category
 +      * tests/extra-portability.test: Redefine `$AUTOMAKE' to ensure we
 +      have complete control over the automake options.  Extend by using
 +      also a setup where no `portability' warning is present (only an
 +      `extra-portability' warning is).  Other minor extensions.  Remove
 +      some redundant, verbose comments about the expected diagnostic.
 +
 +2011-11-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: new functions to analyze configure help screen
 +      * tests/defs (extract_configure_help, grep_configure_help): New
 +      functions.
 +      * tests/maintmode-configure-msg.test: Use them, reducing code
 +      duplication and test brittleness.
 +      * tests/help-depend.test: Likewise.
 +      * tests/help-depend2.test: Likewise.
 +      * tests/help-dmalloc.test: Likewise.
 +      * tests/help-lispdir.test: Likewise.
 +      * tests/help-multilib.test: Likewise.
 +      * tests/help-python.test: Likewise.
 +      * tests/help-regex.test: Likewise.
 +      * tests/help-silent.test: Likewise.
 +      * tests/help-upc.test: Likewise.
 +      * tests/help-init.test: Make grepping of configure help screen
 +      slightly stricter.
 +      * tests/self-check-configure-help.test: New self test.
 +      * tests/Makefile.am (TESTS): Add it.
 +      From a report by Jim Meyering.
 +
 +2011-11-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      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  <stefano.lattarini@gmail.com>
 +
 +      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  <stefano.lattarini@gmail.com>
 +
 +      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  <peda@lysator.liu.se>
 +
 +      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  <peda@lysator.liu.se>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +          Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      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 <zackw@panix.com>  (tiny change)
            Stefano Lattarini  <stefano.lattarini@gmail.com>
  
index 8ebdcd7053306cc5e68c943cf0632c6d43ae52c2,a459338f5c7bbc8e18b7c2affc60b1b4767f2a0b..0c1ac4d02049694e9c5e6f7caa4402cc601f3874
  
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in <<'END'
  AC_PROG_CC
+ AM_PROG_AR
  END
  
  cat > Makefile.am << 'END'
Simple merge
Simple merge
index 22d0cb5f72749b92a8134b51ac3bb43b925a2561,814b537d6d282ffc7d4422e046fd8603a44d7fc1..a694586a6f800f9c19012baf288b43520f02a7ac
  
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in <<'END'
  AC_PROG_CC
+ AM_PROG_AR
  END
  
  cat > Makefile.am << 'END'
Simple merge
Simple merge
Simple merge