From: Stefano Lattarini Date: Wed, 11 Aug 2010 21:52:53 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~387 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16fef95d4a990935f8257cb89df0d36846d1179b;p=thirdparty%2Fautomake.git Merge branch 'maint' Conflicts: tests/acloca18.test tests/condinc2.test --- 16fef95d4a990935f8257cb89df0d36846d1179b diff --cc ChangeLog index e2de1ad55,5453722f2..3f668bcc8 --- a/ChangeLog +++ b/ChangeLog @@@ -1,22 -1,289 +1,308 @@@ + 2010-08-10 Stefano Lattarini + + Tweak and/or extend some `acloca*.test' tests. + * tests/aclocal8.test: Ensure verbose printing of captured + output. + * tests/aclocal.test: Likewise. Also, add trailing `:' + command. + * tests/acloca19.test: Likewise. + * tests/aclocal5.test: Add trailing `:' command, and prefer + `$me' over hard-coded test name. + * tests/aclocal6.test: Likewise. + * tests/aclocal18.test: Add trailing `:' command, and make + some grepping slighty stricter. + * tests/acloca14.test: Likewise. Also, prefer `diff' over + `cmp', and add some "cosmetic" blank lines. + + 2010-08-09 Stefano Lattarini + + Tweak and extend tests `pr[!0-9]*.test'. + * tests/primary3.test: Add trailing `:' command. + * tests/primary.test: Make grepping of Automake's stderr stricter. + Also, add trailing `:' command, and cosmetic changes in spacing. + * tests/primary2.test: Likewise. + * tests/prefix.test: Enable `errexit' shell flags, and related + changes. Add a trailing `:' command. + * tests/proginst.test: Likewise. + + Modernize, improve and extend tests for PR (`pr[0-9]*.test'). + * tests/pr2.test: Add trailing `:' command. + * tests/pr229.test: Likewise. + * tests/pr401.test: Likewise. + * tests/pr401b.test: Likewise. + * tests/pr401c.test: Likewise. + * tests/pr300-prog.test: Likewise, plus cosmetic changes in + spacing. + * tests/pr300-lib.test: Likewise. + * tests/pr300-ltlib.test: Likewise, and ensure verbose printing + of captured make stdout. + * tests/pr211.test: Add trailing `:' command. Also, use the + `configure.in' stub created by ./defs, rather than writing it + from scratch. + * tests/pr204.test: Likewise, plus cosmetic spacing changes. + * tests/pr287.test: Likewise, and move setting of `errexit' shell + flag earlier in the script (just after inclusion of ./defs). + * tests/pr220.test: Make grepping of Automake's stderr stricter. + Also, add trailing `:' command, and cosmetic changes in spacing. + * tests/pr224.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Do not export + `CC=gcc' to configure explicitly (it's already exported globally + in ./defs, since we have "gcc" in $required). Use the stub for + `configure.in' created by ./defs, rather than writing it from + scratch. Do not create dummy files required by "gnu" mode (e.g. + README, NEWS), since we run automake in foreign mode anyway. + * tests/pr72.test: Enable `errexit' shell flags, and related + changes. Extend existing checks a bit. + * tests/pr9.test: Likewise. Also, avoid obolescent constructs in + the generated `configure.in', and extend existing checks over the + generated tarball a bit. + * tests/pr87.test: Enable `errexit' shell flags, and related + changes. Add a trailing `:' command. Also, do not create dummy + files required by "gnu" mode (e.g. README, NEWS), since we run + automake in foreign mode anyway. + * tests/pr243.test: Avoid obolescent constructs in the generated + `configure.in'. Enable the `errexit' shell flag, and related + changes. Cosmetic changes to spacing, add trailing `:' command, + and add a "FIXME" comment. + * tests/pr266.test: Likewise, and add explicit command line switch + `--enable-dependecy-tracking' to the ./configure call. + * tests/pr279.test: Avoid obolescent constructs in the generated + `configure.in'; also, use the `configure.in' stub created by + ./defs, rather than writing it from scratch. Enable `errexit' + shell flag, and related changes. Add trailing `:' command. + * tests/pr279-2.test: Likewise, and make grepping of Makefile.in + stricter. + * tests/pr307.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Escape literal + dots in grep regular expressions. Also, add a trailing `:' + command, and cosmetic changes to spacing. + + Tests for PR: add excerpts from original bug report, for clarity. + * tests/pr2.test: Ditto. + * tests/pr9.test: Likewise. + * tests/pr72.test: Likewise. + * tests/pr87.test: Likewise. + * tests/pr211.test: Likewise. + * tests/pr220.test: Likewise. + * tests/pr224.test: Likewise. + * tests/pr229.test: Likewise. + * tests/pr243.test: Likewise. + * tests/pr266.test: Likewise. + * tests/pr279.test: Likewise, and tell to keep it in sync + with its sister test. + * tests/pr279-2.test: Likewise. + + 2010-08-08 Stefano Lattarini + + Tweak, extend and improve tests `cond[a-z]*.test'. + * tests/condd.test: Add trailing `:' command. Typofix in + comment. + * tests/condhook.test: Make sure target `install-data-hook' is + not called by `make install', but that data files are installed. + Use proper m4 quoting in configure.in. Add trailing `:' command. + * tests/condhook2.test: New test, sister test of condhook, with + inverted semantic. + * tests/condinc2.test: Use proper m4 quoting in configure.in. + Prefer trailing `:' command over trailing `Exit 0'. + * tests/condman2.test: Enable errexit shell flag, and related + changes. Add trailing `:' command. + * tests/condman.test: Likewise. Also, do not create useless + dummy manpages, and use proper m4 quoting in configure.in. + * tests/condman3.test: New test, similar to condman.test, but + it also runs ./configure and "make install", and check the + installed files. + * tests/Makefile.am (TESTS): Updated. + + Modernize, improve and/or extend tests `colon*.test. + * tests/colon.test: Rely on the `configure.in' stub created by + `./defs', rather than writing one from scratch. Do not create + a useless dummy file. Add trailing `:' command. + * tests/colon4.test: Enable the `errexit' shell flag, and + related changes. Rely on the `configure.in' stub created by + `./defs', rather than writing one from scratch. + * tests/colon7.test: Enable `errexit' shell flag, and related + changes. Improve the generated `configure.in' file. Add + trailing `:' command. + * tests/colon2.test: Likewise. Also, add some new checks. + * tests/colon5.test: Improve the generated `configure.in' file. + Add new, much deeper checks. Add trailing `:' command. + * tests/colon6.test: Likewise. + * tests/colon3.test: Add trailing `:' command. Remove useless + comments and echos. Improve the generated `configure.in' file. + make some grepping tests stricter. Add a "FIXME" comments about + planned improvements. + + Improve and extend tests `asm*.test'. + * tests/asm.test: Use configure.in stub generated by ./defs, + and avoid obsoleted autoconf constructs. Make grepping of + Automake stderr stricter. Do not create useless source file. + Improve verbose messages. Minor cosmetic changes. Tell to + keep it in sync with other sister tests asm*.test. + * tests/asm2.test: Likewise. + * tests/asm3.test: Likewise. + + Modernize, improve and/or extend test scripts `conf*.test'. + * tests/confh5.test: Cosmetic changes. + * tests/conff.test: Likewise. + * tests/confdeps.test: Likewise. + * tests/conflnk.test: Likewise. + * tests/conflnk2.test: Likewise. + * tests/confsub.test: Likewise. + * tests/confvar.test: Likewise, and make grepping of Makefile.in + stricter. + * tests/confvar2.test: Likewise. + * tests/conflnk3.test: Cosmetic changes, and re-enable a temporarly + disabled test (which didn't work with autoconf <= 2.59, but now we + are requiring autoconf 2.62, so...) + * tests/conflnk4.test: Cosmetic changes, and extend existing tests + accordingly to "TODO" comments. + * tests/conff2.test: Make grepping of Automake's stderr stricter. + Add some comments explaining why we don't use the `configure.in' + stub preset be ./defs. + * tests/confh.test: Use the `configure.in' stub created by ./defs, + rather than writing one from scratch, and do not call AC_OUTPUT. + Enable `errexit' shell flag, and related changes. Prefer diff over + cmp to compare text files. Prefer perl over sed to fetch the value + of $(DIST_COMMON) from Makefile.in. Make grepping of the contents + of $(DIST_COMMON) stricter. + * tests/confh4.test: Use the `configure.in' stub created by ./defs, + rather than writing one from scratch. Make grepping of Makefile.in + stricter. + * tests/confh5.test: Make grepping of `config.h' stricter. Add a + comment. + * tests/configure.test: Avoid obsolescent constructs in generated + `configure.ac'. Do not write `configure.in' two times. Escape + literal dots in grep regular expressions. + * tests/confincl.test: Enable `errexit' shell flag, and related + changes. Prefer fgrep over grep. Other cosmetic changes. + * tests/config.test: Renamed to ... + * tests/confh6.test: ... this. Fix m4 quoting in `configure.in', + and make grepping of `config.h' and `config.h.in' stricter. + * tests/conf2.test: Renamed ... + * tests/confh7.test: ... to this. Use the `configure.in' stub + created by ./defs, rather than writing one from scratch. Try to + run the checks both with and without AC_PROG_CC and AC_OUTPUT in + `configure.in'. + * tests/Makefile.am (TESTS): Updated. + + Minor improvements and fixes in tests `depcomp*.test'. + * tests/depcomp.test: Do not create useless dummy source files. + Add a trailing `:' command. + * tests/depcomp2.test: Use `unset' on the CFLAG variable to ensure + it's not in in the environment, rather tthan exporting it with an + empty value. Do not pass CC=gcc to configure, as that's already + done in ./defs since we have gcc in $required. Ensure verbose + printing of captured stderr, and normalize its checking. Add a + trailing `:' command. + * tests/depcomp3.test: Quote literal dots and dollar characters in + grep regexps. Always use `: >' rather than `touch' to create empty + files. Explicitly declare phony targets as such in the created + Makefile.am. Add a trailing `:' command. + * tests/depcomp4.test: Quote literal dots and dollar characters in + grep regexp. Explicitly declare phony targets as such in the + created Makefile.am. Ensure verbose printing of captured makes' + stoud/stderr. Add a trailing `:' command. + * tests/depcomp5.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Quote literal dots + and dollar characters in grep regexps. Explicitly declare phony + targets as such in the created Makefile.am. Add a trailing `:' + command. + * tests/depcomp6.test: Consistenty use m4 quoting in the generated + configure.in. Cosmetic fixes to spacing. Make the "dummy" `if' + statement required by OpenBSD's sh `set -e' more robust, and add + explanatory comments to it. + * tests/depcomp7.test: Likewise, and add a trailing `:' command. + + Separate failing part of test `all.test'. + * tests/all.test: Keep only (x)failing part of the test. Working + checks moved out to ... + * tests/all2.test: ... this new test. + * tests/Makefile.am (TESTS): Updated. + + Modernize, improve and extend tests `subobj*.test'. + * tests/subobjname.test: Add trailing `:' command. + * tests/subobj.test: Make grepping of `Makefile.in' stricter. + Escape literal dots in grep regexps. + * tests/subobj2.test: Add trailing `:' command. Do not use the + unportable fgrep option `-e'. + * tests/subobj3.test: Add trailing `:' command. + (configure.in): Use proper m4 quoting, and avoid obsolescent + constructs. + * tests/subobj8.test: Likewise. Also, enable `errexit' shell + flag, with related changes + * tests/subobj4.test: Likewise. Also, make grepping of + `Makefile.in' stricter. + * tests/subobj5.test: Add trailing `:' command. Move setting of + `errexit' shell flag earlier in the script (just after inclusion + of ./defs). + (configure.in): Use the stub created by `./defs', rather than + writing it from scratch, and avoid obsolescent constructs. + * tests/subobj6.test: Add trailing `:' command. Move setting of + `errexit' shell flag earlier in the script (just after inclusion + of ./defs). Do not create useless dummy ac-init file `f'. + * tests/subobj7.test: Do not create useless dummy ac-init file + `f'. + (configure.in): Use the stub created by `./defs', rather than + writing it from scratch, and avoid obsolescent constructs. + * tests/subobj9.test: Move setting of `errexit' shell flag earlier + in the script (just after inclusion of ./defs). Fail the test if + `make distcheck' fails. Ensure verbose printing of captured make + stdout. Avoid uselsss fork by doing simple grep instead of using + test -n "`COMMAND | grep ...`". + (configure.in): Normalize the call to AC_INIT w.r.t. other tests. + (Makefile.am): Explicitly mark target "print" as phony. + * tests/subobj10.test: Removed duplicated call to `set -e'. Add + trailing `:' command. + (configure.in): Normalize the call to AC_INIT w.r.t. other tests. + + Remove a couple of obsoleted tests. + * tests/fpinstall.test: Removed. + * tests/fpinst2.test: Likewise. + * tests/Makefile.am (TESTS): Updated. + + Bootstrap: updated HACKING entry. + * HACKING ("Working with git"): Explain how to override the + autoconf and autom4te programs used by the bootstrap process. + + Bootstrap: fixlet. + * bootstrap: Do not remove `lib/Automake/Config.pm' anymore, + since we don't generate it. Correctly quote arguments of + `eval' builtin. Fixed a botched error message. Removed an + extra blank line. + + Bootstrap: don't search perl in $PATH. + * bootstrap: Do not explicitly search perl in $PATH anymore. + ($PATH_SEPARATOR): Removed, it's no more needed. + + Bootstrap: let the user choose which autoconf to use. + * bootstrap ($AUTOCONF): New variable, from the environment. + ($AUTOM4TE): Likewise, for clarity. + Use "$AUTOCONF" instead of calling "autoconf" directly. + + Minor improvements to tests ar*.test. + * tests/ar.test: Add trailing `:' command. + * tests/ar2.test: Likewise, and make grepping of generated + Makefile.in stricter. + +2010-08-06 Peter Rosin + + Add new auxiliary 'ar-lib' script, wrapping Microsoft lib. + * lib/ar-lib: New auxiliary script. + * lib/Makefile.am: Add above. + * tests/ar-lib.test: New test. + * tests/Makefile.am: Add above. + * automake.in (@common_files): Distribute the 'ar-lib' script. + * doc/automake.texi (Auxiliary Programs): Mention the new + 'ar-lib' script. + (Optional): Mention 'ar-lib' in AC_CONFIG_AUX_DIR. + * NEWS: Update. + +2010-08-07 Ralf Wildenhues + + Fix shell pattern negation in compile script. + * lib/compile (func_file_conv): Use `!' not `^' for pattern + negation. + 2010-08-08 Ralf Wildenhues Fix maintainer-check failure. diff --cc tests/Makefile.am index 06275ae2f,055814937..122b22ca6 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -227,9 -205,9 +228,10 @@@ cond42.test cond43.test \ cond44.test \ cond45.test \ +cond46.test \ condd.test \ condhook.test \ + condhook2.test \ condinc.test \ condinc2.test \ condlib.test \ diff --cc tests/Makefile.in index 32ac0eaa9,a06026e08..81fda4818 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -438,9 -443,9 +439,10 @@@ cond42.test cond43.test \ cond44.test \ cond45.test \ +cond46.test \ condd.test \ condhook.test \ + condhook2.test \ condinc.test \ condinc2.test \ condlib.test \ diff --cc tests/acloca18.test index dbd0bfbb7,982689230..2599b2cef --- a/tests/acloca18.test +++ b/tests/acloca18.test @@@ -126,10 -115,6 +126,14 @@@ cat stderr >& cat stdout grep '#serial 456' stdout test ! -f 4/m1.m4 - grep 'installing.*4/m1.m4' stderr + grep 'installing.*4/m1\.m4' stderr +$ACLOCAL -I 5 2>stderr && { cat stderr >&2; Exit 1; } ++cat stderr >&2 +test `grep -c 'ill-formed serial' stderr` -eq 3 + +$ACLOCAL -I 6 2>stderr && { cat stderr >&2; Exit 1; } ++cat stderr >&2 +grep 'serial.*before any macro definition' stderr ++ + : diff --cc tests/condinc2.test index 451c56fb5,900102888..7210a5bf1 --- a/tests/condinc2.test +++ b/tests/condinc2.test @@@ -39,24 -38,6 +39,24 @@@ EN $ACLOCAL AUTOMAKE_fails -grep 'adjunct:3: too many conditionals closed' stderr +grep 'adjunct:3: error: too many conditionals closed' stderr + +cat > adjunct << 'END' +if TOBE +target: dependency + rule +END + +AUTOMAKE_fails +grep 'unterminated conditionals' stderr + +cat > adjunct << 'END' +if TOBE +target: dependency + rule +endif +END + +$AUTOMAKE - Exit 0 + :