]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 1 Nov 2009 13:39:21 +0000 (14:39 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 1 Nov 2009 13:39:21 +0000 (14:39 +0100)
1  2 
ChangeLog
Makefile.in
lib/Automake/Makefile.in
lib/Makefile.in
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
index 2fe05664a5189049a21b8b19e8578cdda59faf96,178e6fed1c32076fa045acb97cf606679cafe2b6..de7d2215a673df9ce25f2402a2367ce7282154db
+++ b/ChangeLog
+ 2009-10-31  Jim Meyering  <meyering@redhat.com>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       Don't let an envvar setting of "$fail" cause build failure.
+       Without this change, in a project using an automake-generated
+       Makefile, "make fail=anything" would fail inappropriately,
+       due to the `test -z "$$fail"' at the end of this emitted rule:
+       * lib/am/subdirs.am ($(RECURSIVE_TARGETS)): Initialize "fail=" to keep
+       an envvar setting of that variable from causing unwarranted failure.
+       ($(RECURSIVE_CLEAN_TARGETS)): Likewise.
+       * tests/subdir10.test: New test.
+       * tests/Makefile.am: Update.
 +2009-10-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Simplify Variable::_check_ambiguous_condition.
 +      * lib/Automake/Variable.pm (_check_ambiguous_condition): No need
 +      to check for $def since ambiguous_p returns an empty $message if
 +      there is no other condition which is ambiguous to $cond.
 +
 +      Coverage for DisjConditions.pm.
 +      * lib/Automake/tests/DisjConditions.pl (test_basics): Increase
 +      test coverage: test ->human, ->merge, ->simplify, ->multiply.
 +      * lib/Automake/tests/DisjConditions-t.pl (test_basics): Likewise
 +      changes, but including state copies across thread creation.
 +      * lib/Automake/tests/DisjCon2.pl: New test.
 +      * lib/Automake/tests/DisjCon3.pl: Likewise.
 +      * lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Adjust.
 +
 +      Coverage and fixes for Condition.pm.
 +      * lib/Automake/Condition.pm (new): Catch common programming
 +      errors better by checking type of passed argument before
 +      munging them to all be strings through split.
 +      * lib/Automake/tests/Condition.pl (test_basics): Also test
 +      ->human.
 +      (test_merge): New function, test ->merge, ->merge_conds,
 +      ->strip.
 +      * lib/Automake/tests/Condition-t.pl (test_basics, test_merge):
 +      Likewise changes, but including state copies across thread
 +      creation.
 +      * lib/Automake/tests/Cond2.pl: New test for programming error.
 +      * lib/Automake/tests/Cond3.pl: Likewise.
 +      * lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
 +
 +      Coverage for Wrap.pm.
 +      * lib/Automake/tests/Wrap.pl (@tests): Add test for word with
 +      trailing space.
 +      (test_makefile_wrap, @makefile_tests): New function, new list of
 +      tests, to test makefile_wrap.
 +
 +      Coverage for Version.pm.
 +      * lib/Automake/tests/Version.pl (test_version_compare): Also
 +      try Automake::Version::check for the version pairs, taking into
 +      account the special-case naming of code forks.
 +      (@tests): Add more test cases.
 +      (test_bad_versions, @bad_versions): New function, new test cases,
 +      to ensure bad version strings are rejected.
 +      * lib/Automake/tests/Version2.pl: New test.
 +      * lib/Automake/tests/Version3.pl: Likewise.
 +      * lib/Automake/tests/Makefile.am (TESTS): Add tests here ...
 +      (XFAIL_TESTS): ... and here, new.
 +
 +      Pod coverage for Perl modules.
 +      * lib/Automake/ChannelDefs.pm (parse_warnings): Fix
 +      typo in Pod documentation.
 +      * lib/Automake/Condition.pm: Add a couple of missing `=back'
 +      lines.
 +      (_has): Renamed from ...
 +      (has): ... this, as this is an internal method.
 +      (strip, false, true_when): Adjust callers.
 +      * lib/Automake/Configure_ac.pm: Add Pod `Functions' section with
 +      documentation for find_configure_ac and require_configure_ac.
 +      * lib/Automake/Location.pm: Fix typo in Pod.  Add `Methods'
 +      section, document methods.
 +      * lib/Automake/RuleDef.pm: New `Methods' Pod section.
 +      * lib/Automake/VarDef.pm: Document `raw_value'.
 +      * lib/Automake/Wrap.pm (_tab_length): Rename from ...
 +      (tab_length): ... this, as this is an internal method.
 +      (wrap): Adjust callers.
 +      * lib/Automake/XFile.pm: Reorganize Pod a bit, add `Methods'
 +      section.
 +
  2009-10-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +      Perl coverage support using Devel::Cover.
 +      This introduces makefile rules to run the testsuite with Perl
 +      coverage enabled.  It skips tests that use perl ithreads, by
 +      unsetting AUTOMAKE_JOBS and setting WANT_NO_THREADS to make the
 +      threaded tests skip.
 +      * Makefile.am (PERL_COVERAGE_DB, PERL_COVERAGE_FLAGS)
 +      (PERL_COVER): New variables.
 +      (check-coverage, recheck-coverage, clean-coverage): New phony
 +      targets.
 +      (check-coverage-run, recheck-coverage-run): New phony helper
 +      targets.
 +      (clean-local): New, depend on clean-coverage.
 +      * lib/Automake/tests/Condition-t.pl: Skip if WANT_NO_THREADS is
 +      set.
 +      * lib/Automake/tests/DisjConditions-t.pl: Likewise.
 +      * tests/defs.in: New required entry 'perl-threads'.
 +      * tests/parallel-am.test: Use it to skip if WANT_NO_THREADS is
 +      set.
 +      * tests/parallel-am2.test: Likewise.
 +      * tests/parallel-am3.test: Likewise.
 +
 +      Add convenience `recheck' target to our toplevel Makefile.am.
 +      * Makefile.am (recheck): New convenience target.
 +      * tests/README: Give examples for running only failed or
 +      outdated or otherwise selected tests.
 +
 +      dist: allow running several compressors in parallel.
 +      * lib/am/distdir.am (am__post_remove_distdir): New internal
 +      variable.
 +      (DIST_TARGETS): New variable, set to list of chosen distribution
 +      formats.  Order formats by expected duration, slowest first, for
 +      better parallelism.
 +      (dist-gzip, dist-bzip2, dist-lzma, dist-xz, dist-tarZ)
 +      (dist-shar, dist-zip): Use $(am__post_remove_distdir).
 +      (dist, dist-all): Do not depend on distdir.  Instead of
 +      replicating each compression command, use a recursive invocation
 +      to allow running all $(DIST_TARGETS) in parallel.
 +      * NEWS: Update.
 +      Report by Peter Breitenlohner.
 +
 +      Fix license headers of cscope tests to be GPLv2+.
 +      * tests/cscope.test: Revert to GPL version 2.
 +      * tests/cscope2.test: Likewise.
 +      * tests/cscope3.test: Likewise.
 +
        Sync auxiliary files from upstream.
        * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
        lib/texinfo.tex: Sync from upstream.
diff --cc Makefile.in
Simple merge
Simple merge
diff --cc lib/Makefile.in
Simple merge
Simple merge
Simple merge