From: Stefano Lattarini Date: Thu, 25 Nov 2010 11:21:00 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~325 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b2fe01376047225c0c0fe038baf9db37c1701ba;p=thirdparty%2Fautomake.git Merge branch 'maint' --- 0b2fe01376047225c0c0fe038baf9db37c1701ba diff --cc ChangeLog index 52291deb1,2cbce3be1..14e6c79be --- a/ChangeLog +++ b/ChangeLog @@@ -210,145 -150,9 +210,145 @@@ * tests/yaccdry.test: Require bison. Found by NixOS Hydra. +2010-11-12 Stefano Lattarini + + Fix bug in test `backcompat6.test' (MSYS portability). + * tests/backcompat6.test (Makefile.am): Grep the output from the + test program, rather than diffing it, to avoid spurious failures + on MinGW/MSYS due to LF vs. CRLF line endings. + Reported by Ralf Wildenhues. + +2010-11-13 Stefano Lattarini + + Deprecate obsolete macro AM_WITH_REGEX. + * m4/regex.m4: Document the `AM_WITH_REGEX' macro as obsolete, + and state that it should be removed two years from now. + (AM_WITH_REGEX): Raise an m4-time warning of the "obsolete" + category when this macro is used. + * doc/automake.texi (Public Macros): Move description of + `AM_WITH_REGEX' from here ... + (Obsolete Macros): ... to here, and declare it as obsolete + and "to be removed in a future version". + * tests/regex-obsolete.test: New test. + * tests/Makefile.am (TESTS): Update. + +2010-11-08 Stefano Lattarini + + Improve and extend tests on man pages support. + * tests/man.test: Enable `errexit' shell flag, and related changes. + Make grepping of generated Makefile.in slighty stricter. + * tests/man3.test: Add trailing `:' command. + * tests/man5.test: Prefer cat + here-doc over echo to append to + configure.in. + * tests/man2.test: Likewise, and add trailing `:' command. + * tests/man4.test: More thorough and consistent checking of make + error messages. Place fake `help2man' program in a new `bin' + directory rather than in `.'. Move the checks using the real + `help2man' program to ... + * tests/man6.test: ... this new test, and extend them. This test + passes with GNU make and Solaris make, still fails with BSD make. + * tests/man7.test: New test, extracted from old man4.test, which + checks for a bug in maintainer-clean w.r.t. generated manpages. + * tests/man8.test: New test, extracted from old man4.test, which + checks for a bug in distcheck w.r.t. generated manpages. Passes + with GNU make and Solaris make, still fails with BSD make. + +2010-11-08 Stefano Lattarini + + Minor improvements and extensions to various tests. + * tests/defun.test: Also run autoconf and grep the generated + configure to make sure that aclocal truly picks up all the + required macros. + * tests/compile_f_c_cxx.test: Prefer trailing `:' over trailing + `Exit 0'. Do not create useless dummy source files. Do not set + useless `$(foo_LDADD)' variable in `Makefile.am'. Do not call + useless macro `AC_F77_LIBRARY_LDFLAGS' in `configure.in'. + * tests/compile_f90_c_cxx.test: Likewise. + * tests/suffix10.test: Slighty stricter grepping of make output. + * tests/compile.test: Add trailing `:' command. + * tests/defun2.test: Likewise. + * tests/vars3.test: Likewise. + * tests/vartar.test: Likewise. + * tests/vars.test: Likewise. Also, extend test by checking + that the definition of `MY_FLAGS*' variables is preserved in + the generated `Makefile.in'. + * tests/stamph2.test: Prefer trailing `:' over trailing `Exit 0'. + Use proper m4 quoting in `configure.in'. + +2010-11-11 Stefano Lattarini + + Tests defs: improve messages for skipped tests. + * tests/defs: Give meaningful messages about the reasons of a + test skip; this is especially useful as this file is run without + verbose xtraces on. Related reorderings in the code and new + comments. + +2010-11-10 Stefano Lattarini + + Tests defs: move static definitions in a new file `defs-static'. + The new file is meant to be idempotent w.r.t. mutiple inclusions. + * tests/defs.in: Removed, its contents split among ... + * tests/defs-static.in: ... this new file ... + * tests/defs: ... and this new file, including the former. + * configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add + `tests/defs-static'. + (AC_CONFIG_LINKS): Add `tests/defs'. + * tests/Makefile.am ($(parallel_tests)): Update. + ($(instspc_tests)): Likewise. + * tests/.gitignore: Update. + + Tests defs: $testsbuilddir is now AC_SUBST'ed. + * tests/defs.in ($testsbuilddir): Substitute from @abs_builddir@. + Add sanity check on $testsbuilddir, similar to those on + $testsrcdir and $top_testsrcdir. + + Tests defs: do not print message "Running test $0" anymore. + * tests/defs.in: Printing the message "=== Running test $0" at + the beginning of each tests made sense when Automake used the old + test-driver, which sent all the output directly to stdout/stderr. + Now that the parallel test-driver is used, which saves output of + each test in its correspoding log file, that old message is just + useless noise. + + Tests defs: rename $curdir -> $testbuilddir + * tests/defs.in: Rename $curdir to $testbuildir, for clarity and + consistency with $testsrcdir and $top_testsrcdir. + + Tests defs: prefer "$curdir" over "`pwd`". + * tests/defs.in: We already save the value of `pwd` in $curdir + early in the file, so there no need to recalculate it later, when + the current working directory is not changed. + + Tests defs: use `$me' in more error messages. + * tests/defs.in: Also use `$me' in error messages referring to + missing `defs' or `defs.in', since that variable is now defined + before those checks. + + Tests defs: do not use `Exit' where plain `exit' suffices. + * tests/defs.in: Use "exit 77" rather than "Exit 77" to skip the + test when required libtool/gettext macros are not found, since + such skips would take place before the exit trap is installed. + + Tests defs: improve and extends comments. + * tests/defs.in: Improve and extends some comments, especially in + relation with the changes introduced by the previous reordering. + + Tests defs: various reorderings. + * tests/defs.in: Reordered various snippets of code in a + clearer way. + +2010-11-09 Stefano Lattarini + + Fix bug in test `backcompat4.test' (stale autom4te cache). + * tests/backcompat4.test: Remove stale autom4te cache directory + before re-running aclocal and automake. Also, since we are at + it, be more verbose in displaying contents of generated files, + to ease debuggability. + Reported by Ralf Wildenhues. + 2010-11-07 Stefano Lattarini - Fix a bug in variable concatanation with `+='. + Fix a bug in variable concatenation with `+='. * lib/Automake/VarDef.pm (append): Since the content of the "appended-to" variable is going to be unconditionally normalized later, simply separate the appended value with a single whitespace @@@ -1551,10 -1028,8 +1551,10 @@@ * tests/ext.test: Add a comment explaining why an apparently useless `if' statement is indeed required. +2010-06-13 Stefano Lattarini + Add useful comment in test script obsolete.test. - * tests/obsolte.test: Add a comment explaining why we need + * tests/obsolete.test: Add a comment explaining why we need an indirection in adding $AUTOUPDATE to $required. Normalize whitespaces in 'tests/Makefile.am'. @@@ -1626,16 -1092,9 +1626,16 @@@ * tests/pluseq4.test: Likewise. * tests/pluseq6.test: Likewise. * tests/pluseq7.test: Do not create useless dummy source file. - * tests/pluseq9.test: Slighty extended w.r.t. the grepping of + * tests/pluseq9.test: Slightly extended w.r.t. the grepping of Automake stderr. Some unrelated cosmetic changes. +2010-06-12 Stefano Lattarini + + cscope.test: ensure verbose printing of captured stderr. + * tests/cscope.test: Print captured stderr before failing. + +2010-06-12 Stefano Lattarini + Testsuite: ensure verbose printing of captured stderr. * tests/acloca18.test: Print captured stderr before either failing or grepping it. Be sure to send captured stderr to stderr, not to @@@ -1746,22 -1205,9 +1746,22 @@@ * tests/python2.test: Improved verbose messages. Make test `ammissing.test' stricter. - * tests/ammissing.test: Fail if $ACLOCAL succeds unexpectedly. + * tests/ammissing.test: Fail if $ACLOCAL succeeds unexpectedly. Enable `errexit' shell flag. +2010-06-08 Stefano Lattarini + Ralf Wildenhues + + Fix error in generation of parallel tests. + * tests/defs.in ($am_skip_defs): New variable, to be used when + ./defs must be sourced multiple times. If set, unset it and + only define $srcdir; otherwise, also go through the rest of + the script. + ($am_defs_included): Remove, no more needed. + * tests/Makefile.am ($(parallel_tests)): Update accordingly, + using only $srcdir from defs. + Fixes potential test failures of tests that use $required. + 2010-06-08 Stefano Lattarini Enable `errexit' shell flag in some test scripts.