From: Ralf Wildenhues Date: Sun, 6 Jun 2010 08:53:03 +0000 (+0200) Subject: Merge branch 'je-silent' into maint X-Git-Tag: v1.11.1b~82^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97cab581c9510e62e62683adeeda1d15a7f5fdee;p=thirdparty%2Fautomake.git Merge branch 'je-silent' into maint * je-silent: Relax silent-rules tests to cater to verbose makes. Fix silent-rules output for disabled dependency tracking. --- 97cab581c9510e62e62683adeeda1d15a7f5fdee diff --cc ChangeLog index 6d40c54a2,59ff6942c..81b7548e7 --- a/ChangeLog +++ b/ChangeLog @@@ -1,314 -1,37 +1,348 @@@ + 2010-06-06 Stefano Lattarini + + Relax tests on silent-rules to cater to overly verbose makes. + * tests/silent.test: When testing silent builds, don't fail if + make's output simply contains the `mv' substring, but only if + it contains the `mv ' substring (note the trailing space). + * tests/silent2.test: Likewise. + * tests/silent3.test: Likewise. + * tests/silent4.test: Likewise. + * tests/silent5.test: Likewise. + * tests/silent9.test: Likewise. + + 2010-01-24 Ralf Wildenhues + + Fix silent-rules output for disabled dependency tracking. + * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable + expansion code to also work in the case where %AMDEP% expands + to FALSE at config.status time, using new substitution string + %VERBOSE-NODEP%. + * automake.in (verbose_nodep_flag): New function, appending + `@am__nodep@' to the verbose-variable name. + (handle_languages): If dependencies are not disabled, use it to + set %VERBOSE-NODEP%. + * m4/depend.m4: Substitute am__nodep as '_no', so the second + verbose-variable will always expand to an empty string, if + dependencies are enabled. + * tests/silent5.test: Also test --disable-dependency-tracking; + also test per-target flags for non-C language files. + * tests/silent9.test: New test, like silent4.test but disable + dependency tracking. + * tests/Makefile.am: Adjust. + * NEWS, THANKS: Update. + Report by Dmitry V. Levin . + +2010-05-23 Stefano Lattarini + + Extend test on `nostdinc' automake option. + * tests/nostdinc.test: Enable `errexit' shell flag. Related and + unrelated minor changes. Make the grepping of the generated + Makefile.in slighty stricter. Generate and run configure, so that + the generated Makefile can be grepped too. + +2010-05-23 Ralf Wildenhues + + Make gnupload portable to EBCDIC hosts. + * lib/gnupload: Use literal newline as argument for 'tr' rather + than \015, for EBCDIC hosts. Also, avoid unportable nested + double-quotes and backquotes. + * THANKS: Update. + Report from Eric Blake and Steve Goetze via gnulib. + +2010-05-23 Stefano Lattarini + + Fix Autoconf version required by Automake's configure. + Automake configure script used to tell that automake required + autoconf 2.60 or later, but then it checked for autoconf >= 2.62, + and if that was not found, it gave an error saying that Automake + required configure 2.61a-341 or later. This change should + eliminate such inconsistencies. + * configure.ac ($required_autoconf_version): New variable. + Use it throughout. + +2010-05-23 Ralf Wildenhues + + Fix unportable sed script in maintainer-check test. + * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to + not contain semicolon after 'b' or brace commands, for NetBSD. + + Wildcards are not portable to NetBSD make. + * doc/automake.texi (Wildcards): Document portability issue. + * tests/extra10.test, tests/extra11.test, tests/extra12.test: + Require GNU make. + +2010-05-23 Stefano Lattarini + + Make test for configure.in vs. configure.ac stricter. + * tests/configure.test: Use a configure.in file that provokes + an automake error, to ensure configure.ac is preferred. + + Avoid possible false negatives in dejagnu7.test. + * tests/dejagnu7.test: Enable shell `errexit' flag. Also, avoid + unportable use of fgrep option `-e'. + + * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE' + instead of respectively `test -e FILE' and `test ! -e FILE', + since Solaris Sh doesn't grok the latter. Do not SKIP the test + if the shell doesn't support `test -e'. + +2010-04-25 Ralf Wildenhues + + Fix typo in manual. + * doc/automake.texi (Simple Tests using parallel-tests): Add + missing closing parenthesis. + + Fix leftover call to removed function macros_dump. + * automake.in (read_main_am_file): Call variables_dump, not + macros_dump. Print actual error before list of variables. + +2010-04-25 Stefano Lattarini + + Minor improvements in comments of test `silent3.test'. + * tests/silent3.test: Tell to keep it in sync with `silent9.test' + too. + +2010-04-25 Ralf Wildenhues + + testsuite: ensure verbose printing of captured output. + * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test, + tests/fort2.test, tests/help.test, tests/missing3.test, + tests/missing6.test: Print captured stdout or stderr before + grepping it. + +2010-04-20 Stefano Lattarini + + Make test badopt.test stricter (by enabling `set -e'). + * tests/badopt.test: Add call to `set -e'. Due to this change, + an unexpected failure in the call to `$ACLOCAL' (whose outcome + was previously unchecked) would cause the whole test to fail. + Also, bumped the copyright years. + + Make test for configure.in vs. configure.ac stricter. + * tests/configure.test: Use a configure.in file that provokes + an automake error, to ensure configure.ac is preferred. + + Use `set -e' in confsub.test (avoids possible false negatives). + * tests/confsub.test: Enable shell `errexit' flag, and related + changes (this helps avoiding some possible minor false negatives). + Also, bumped copyright years. + +2010-04-20 Ralf Wildenhues + + Fix -Werror handling for presence of configure.in and configure.ac. + * lib/Automake/Variable.pm (Automake::Variable): Do not initialize + $configure_ac at the global level, before command-line arguments + have been parsed. + (require_variables): Initialize it here. + * tests/configure.test: New test. + * tests/Makefile.am: Update. + Report by Stefano Lattarini. + +2010-04-20 Stefano Lattarini + + Avoid possible false negatives in confh5.test. + * tests/confh5.test: Enable shell `errexit' flag, and bumped + copyright years. Due to this change, any unexpected failure + in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or + a failure in grepping expected text in output files should now + cause the whole test to fail. + +2010-04-17 Stefano Lattarini + + Fixed typo in POD documentation of Automake::Channels. + * lib/Automake/Channels.pm: Fixed typo in POD documentation: + @<...> was used instead of C<...>. + +2010-04-14 Stefano Lattarini + + Refactor tests on Automake TESTS color output. + * tests/color.test: Tests using the expect program moved out to... + * tests/color2.test: ... this new file. + * tests/Makefile.am (TESTS): Extended accordingly. + +2010-04-12 Stefano Lattarini + + Fix typos in comments in test confh5.test + * tests/confh5.test: Fix a couple of typos in comments. + + Avoid possible false negatives in canon-name.test. + * tests/canon-name.test: Enable shell `errexit' flag. Improve + test description. + +2010-04-11 Ralf Wildenhues + + Fix per-Makefile.am setting of -Werror. + Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one + Makefile.am would carry over to other Makefile.am files + treated afterwards by the same thread, causing inconsistent + and unstable exit status values. + * lib/Automake/Channels.pm (dup_channel_setup) + (drop_channel_setup): Save and restore the setting of + $warnings_are_errors. + * tests/werror3.test: New test. + * tests/Makefile.am: Adjust. + * NEWS: Update. + +2010-04-11 Stefano Lattarini + + Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh. + * tests/confh5.test: In the generated Makefile.am: do not use + `test ! -e FILE' to check for the non-existence of a file, since + that is not supported by Solaris/Heirloom Sh. + + Make test `aclocal3.test' stricter. + * tests/aclocal3.test: Add call to `set -e'. Fail if $ACLOCAL + succeds unexpectedly. + + Add tests checking that symlinks are resolved by `make dist'. + * tests/distlinks.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + Suggested by observations from Ralf Wildenhues. + +2010-04-11 Ralf Wildenhues + + Use -9 for maximum xz compression with dist-xz. + * lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz. + * NEWS, THANKS: Update. + Report by Pavel Sanda. + +2010-03-30 Stefano Lattarini + + Avoid an unportable use of `$status' shell variable. + * Makefile.am (path-check): Don't use the `$status' shell variable + in the target's rules, as it's special in Zsh (equivalent to `$?', + and readonly). + + Avoid another use of `chmod -R'. + * Makefile.am (path-check): To be safe, do not use `chmod -R' on + $(distdir) before removing it (as Solaris `chmod -R' touches + symlink targets). Instead, use the cleanup strategy used in + distdir.am. + +2010-03-28 Ralf Wildenhues + + Remove uses of @acronym and @sc. + * doc/automake.texi (Public Macros, Limitations on File Names): + Remove all usage of @acronym and @sc in the manual. + Suggested by Karl Berry. + +2010-03-13 Karl Berry + + GNU hello uses fdl.texi, not gpl.texi. + * doc/automake.texi (Texinfo): Adjust example to upstream + change. + +2010-03-06 Ralf Wildenhues + + Formatting cleanups in macro comments. + * automake.in, lib/Automake/Channels.pm, + lib/Automake/FileUtils.pm, lib/Automake/Options.pm, + lib/Automake/Variable.pm, lib/Automake/XFile.pm, + m4/options.m4, m4/substnot.m4: Fix macro comment format. + +2010-03-04 Stefano Lattarini + Ralf Wildenhues + + Avoid generation of `tests/defs-p' file. + * tests/defs.in: In the generated `configure.in' snippet: call + `AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell + variable `parallel_tests' is set to `yes'. + * tests/Makefile.am (defs-p): Target removed. + (check_SCRIPTS): Removed `defs-p'. + (clean-local-check): Do not unlink `defs-p' anymore. + ($(parallel_tests)): Transformation rules for the test scripts + adjusted. + * tests/gen-parallel-tests: Selection rules for the test + scripts adjusted. + * tests/parallel-tests.test: Set `$parallel_tests' to `yes' + then include `./defs' (rather than simply including `./defs-p'). + * tests/parallel-tests2.test: Likewise. + * tests/parallel-tests3.test: Likewise. + * tests/parallel-tests4.test: Likewise. + * tests/parallel-tests5.test: Likewise. + * tests/parallel-tests6.test: Likewise. + * tests/parallel-tests7.test: Likewise. + * tests/parallel-tests8.test: Likewise. + * tests/parallel-tests9.test: Likewise. + * tests/parallel-tests10.test: Likewise. + * tests/README (Section "Writing Test Cases" subsection "Do"): + Adjusted the parts referring to tests checking `parallel-tests' + behaviour. Some other minor related improvements. + * tests/.gitignore (defs-p): Removed. + +2010-03-04 Stefano Lattarini + + Remove redundant unset of variable TESTS from some test scripts. + * tests/color.test: Do not unset the `TESTS' variable, as it's + already unset in the `defs' file. + * tests/check5.test: Likewise. + * tests/check8.test: Likewise. + * tests/check9.test: Likewise. + * tests/check10.test: Likewise. + * tests/check11.test: Likewise. + * tests/parallel-tests.test: Likewise. + * tests/parallel-tests3.test: Likewise. + * tests/parallel-tests4.test: Likewise. + * tests/parallel-tests5.test: Likewise. + * tests/parallel-tests6.test: Likewise. + * tests/parallel-tests7.test: Likewise. + +2010-02-22 Karl Berry + + Improve help message of mdate-sh. + * mdate-sh: mention actual output format in help message. + +2010-02-22 Ralf Wildenhues + + Deprecate dist-lzma in favor of dist-xz. + * doc/automake.texi (The Types of Distributions, Options): + Adjust text to reflect renaming of lzma to xz. + * NEWS: Update. + Missing deprecation noted by Antonio Diaz Diaz. + +2010-02-20 Stefano Lattarini + + Add tests about support of wildcards in EXTRA_DIST. + * tests/extra10.test: New test, check basic support of wildcards + in EXTRA_DIST. + * tests/extra11.test: New test, check more complex usage of + wildcards in EXTRA_DIST. + * tests/extra12.test: New test, check usage of wildcards in + EXTRA_DIST when $builddir != $srcdir. + * tests/Makefile.am (TESTS): Updated accordingly. + Necessity of these new tests suggested by Braden McDaniel + and Ralf Wildenhues. + +2010-02-08 Simon Josefsson + + Fix copyright statement in gnupload script. + * lib/gnupload: Fix copyright statement. + +2010-02-06 Dmitry V. Levin (tiny change) + Ralf Wildenhues + + Fix exit status of signal handlers in shell scripts. + The value of `$?' on entrance to signal handlers in shell scripts + cannot be relied upon, so set the exit code explicitly to + 128 + SIG. + * lib/am/check.am (am__check_pre): Use `exit 143' in signal handler. + * lib/elisp-comp: Likewise. + * lib/install-sh: Likewise. + * lib/ylwrap: Likewise. Also, fix script to trap signal 13, not 3. + * NEWS, THANKS: Update. + Bug report, analysis, and initial patch by Dmitry V. Levin. + +2010-02-06 Karl Berry + + Improve gnupload usage text. + * gnupload (usage): Shorten to make more likely to fit on a tty + line. Mention CMD in the synopsis. With ..., plural is implied. + +2010-01-28 Christos Kontas (tiny change) + + Fix some typos in the manual + * doc/automake.texi (Nested Packages, Rebuilding): Fix typos. + 2010-01-17 Stefano Lattarini Slighty improve tests acoutbs.test and acoutbs2.test. diff --cc NEWS index fee7f83f2,bf8025376..5b6c0565c --- a/NEWS +++ b/NEWS @@@ -12,8 -7,11 +12,13 @@@ Bugs fixed in 1.11.0a - The `parallel-tests' test driver works around a GNU make 3.80 bug with trailing white space in the test list (`TESTS = foo $(EMPTY)'). + - The `silent-rules' option now also silences all compile rules if dependency + tracking is disabled. Also, when `silent-rules' is not used, the output from + `make' does not contain spurious extra lines with only a backslash in them + any more; it now again matches that from pre-1.11 Automake. + + - The `dist-xz' option now uses `xz -9' for maximum compression. + * Long standing bugs: - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'