Stefano Lattarini [Wed, 9 Jun 2010 13:20:58 +0000 (15:20 +0200)]
Tests defs: remove variable $testaclocaldir.
* tests/defs.in ($testaclocaldir): Removed.
* tests/aclocal.test: Use `$top_testsrcdir/m4' directly, no
t `$testaclocaldir'.
Stefano Lattarini [Wed, 2 Jun 2010 19:55:23 +0000 (21:55 +0200)]
Tests defs: $srcdir renaming.
* tests/defs.in ($srcdir): Remove, define $testsrcdir directly.
* tests/Makefile.am ($(parallel_tests)): Generation of derived
tests updated.
Stefano Lattarini [Wed, 2 Jun 2010 23:03:00 +0000 (01:03 +0200)]
Tests defs: new variable $top_testsrcdir.
* tests/defs.in ($top_testsrcdir): Define unconditionally
to @abs_top_srcdir@. Use it throughout.
* tests/ar-lib.test: Use `$top_testsrcdir' instead of
`$testsrcdir/..'.
* tests/auxdir.test: Likewise.
* tests/compile.test: Likewise.
* tests/compile2.test: Likewise.
* tests/compile3.test: Likewise.
* tests/compile5.test: Likewise.
* tests/mdate6.test: Likewise.
* tests/mkinst3.test: Likewise.
* tests/multlib.test: Likewise.
* tests/txinfo22.test: Likewise.
Stefano Lattarini [Wed, 2 Jun 2010 19:45:57 +0000 (21:45 +0200)]
Tests defs: $srcdir is unconditionally substituted.
* tests/defs.in ($srcdir): Define unconditionally to @abs_srcdir@.
Remove code $srcdir normalization, which is now useless.
Stefano Lattarini [Thu, 2 Sep 2010 19:44:55 +0000 (21:44 +0200)]
Tests defs: make spacing more consistent.
* tests/defs.in: Make spacing more consistent in indentation.
Especially, indent using only spaces, not tabs. Also, move
a comment to a better position.
Stefano Lattarini [Wed, 2 Jun 2010 19:23:34 +0000 (21:23 +0200)]
Improve code for requiring libtool and gettext in tests.
* tests/defs.in: Stricter (and more correct) detection of wheter
libtool, libtoolize and/or gettext are in $required.
Peter Rosin [Tue, 31 Aug 2010 19:58:29 +0000 (21:58 +0200)]
Merge branch 'msvc'
Peter Rosin [Tue, 31 Aug 2010 19:57:22 +0000 (21:57 +0200)]
Do file name conversion for object files in the compile wrapper.
* lib/compile (func_cl_wrapper): Do file name conversion for object
files (i.e. extensions .obj, .OBJ, .o and .O) if needed.
* lib/compile4.test: Test the above.
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Ralf Wildenhues [Sat, 21 Aug 2010 09:07:22 +0000 (11:07 +0200)]
Merge branch 'faster-clean'
* faster-clean:
Speed up removal of auxiliary linker output files for ltlibraries.
Ralf Wildenhues [Sat, 21 Aug 2010 09:05:25 +0000 (11:05 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 21 Aug 2010 09:04:04 +0000 (11:04 +0200)]
Speed up removal of auxiliary linker output files for ltlibraries.
* lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Rewrite using just
one `rm' invocation.
Report by Bob Friesenhahn.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 21 Aug 2010 05:27:12 +0000 (07:27 +0200)]
Improve robustness of mdate-sh script.
* lib/mdate-sh: Sanitize zsh behavior on startup, to ensure
$ls_command is word-split properly upon invocation.
(error): New function.
(main): Use it. Improve error checking to avoid endless loop
in case $ls_command gave bogus output. Fix eval quotation.
* tests/mdate6.test: New test, to expose eval quotation error.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Wed, 18 Aug 2010 22:05:27 +0000 (00:05 +0200)]
HACKING: Perl 4 is obsolete.
* HACKING (Editing automake.in and aclocal.in): Remove note about
Perl 5.
Stefano Lattarini [Wed, 18 Aug 2010 22:04:34 +0000 (00:04 +0200)]
HACKING: improve description of git "bugfix branches".
* HACKING (Working with git): Extend the description of git
"bugfix branches".
Stefano Lattarini [Wed, 18 Aug 2010 21:46:01 +0000 (23:46 +0200)]
Merge branch 'fix-decomp-tests-regression'
Stefano Lattarini [Wed, 18 Aug 2010 21:45:48 +0000 (23:45 +0200)]
Merge branch 'fix-decomp-tests-regression' into maint
Stefano Lattarini [Wed, 18 Aug 2010 12:39:59 +0000 (14:39 +0200)]
Fix potential regressions in depcomp{3,5}.test.
* tests/depcomp3.test: Do not uselessly escape the character `$'
in makefile rules, when it's used to expand a make macro.
* tests/depcomp5.test: Likewise.
Stefano Lattarini [Tue, 17 Aug 2010 20:19:08 +0000 (22:19 +0200)]
Docs: clarify how to avoid automatic dependencies tracking.
* doc/automake.texi (Automatic dependency tracking): Mention that
automatic dependencies tracking is enabled by default, but that
the package developer can disable it altogether. Add a reference
to the proper section for a more in-depth explanation.
Stefano Lattarini [Tue, 17 Aug 2010 17:23:47 +0000 (19:23 +0200)]
Fix typo in manual (`Makefile.in' instead of `Makefile.am').
* doc/automake.texi (Automatic dependency tracking): Fix typo.
Stefano Lattarini [Tue, 17 Aug 2010 20:19:08 +0000 (22:19 +0200)]
Docs: clarify how to avoid automatic dependencies tracking.
* doc/automake.texi (Automatic dependency tracking): Mention that
automatic dependencies tracking is enabled by default, but that
the package developer can disable it altogether. Add a reference
to the proper section for a more in-depth explanation.
Stefano Lattarini [Tue, 17 Aug 2010 17:23:47 +0000 (19:23 +0200)]
Fix typo in manual (`Makefile.in' instead of `Makefile.am').
* doc/automake.texi (Automatic dependency tracking): Fix typo.
Ralf Wildenhues [Mon, 16 Aug 2010 20:26:23 +0000 (22:26 +0200)]
Merge branch 'maint'
Bruno Haible [Mon, 16 Aug 2010 20:14:12 +0000 (22:14 +0200)]
Don't hide the table of contents.
* doc/automake.texi: Move the table of contents to the beginning.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Peter Rosin [Mon, 16 Aug 2010 20:06:07 +0000 (22:06 +0200)]
Merge branch 'msvc'
Peter Rosin [Mon, 16 Aug 2010 11:50:32 +0000 (13:50 +0200)]
Optimize compile script on MSYS.
* lib/compile (func_file_conv): Add new argument 'lazy' which
takes an optional list of conversion types where the requested
conversion isn't needed.
(func_cl_wrapper): Take advantage of the above for cases where
MSYS is doing the conversion for us.
Suggested by Ralf Wildenhues.
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Peter Rosin [Mon, 16 Aug 2010 08:00:23 +0000 (10:00 +0200)]
Merge branch 'msvc'
Peter Rosin [Mon, 16 Aug 2010 07:59:10 +0000 (09:59 +0200)]
Support more C++ file extensions for MSVC in the compile script.
* lib/compile (func_cl_wrapper): MSVC only recognizes the .cpp
file extension as C++, unless it's given a hint. So hint about
.cc, .CC, .cxx, .CXX, c++ and C++. Also do path conversion on
.c, .cpp, .CPP, .lib, .LIB and .Lib files.
* lib/compile3.test: Test the C++ hinting.
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Peter Rosin [Fri, 13 Aug 2010 06:23:44 +0000 (08:23 +0200)]
Merge branch 'msvc'
Peter Rosin [Thu, 12 Aug 2010 16:01:18 +0000 (18:01 +0200)]
Enable the use of "link -lib" as the wrapped archiver.
* lib/ar-lib: Enable the use of "link -lib" as the wrapped
archiver, as well as allowing some other options to be passed
through to the wrapped archiver.
* tests/ar-lib.test: Test the above.
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Stefano Lattarini [Wed, 11 Aug 2010 21:52:53 +0000 (23:52 +0200)]
Merge branch 'maint'
Conflicts:
tests/acloca18.test
tests/condinc2.test
Stefano Lattarini [Tue, 10 Aug 2010 23:21:29 +0000 (01:21 +0200)]
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.
Stefano Lattarini [Tue, 10 Aug 2010 16:56:38 +0000 (18:56 +0200)]
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.
Stefano Lattarini [Mon, 21 Jun 2010 15:47:28 +0000 (17:47 +0200)]
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.
Stefano Lattarini [Sat, 26 Jun 2010 13:33:50 +0000 (15:33 +0200)]
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.
Stefano Lattarini [Sun, 8 Aug 2010 14:45:17 +0000 (16:45 +0200)]
PR tests: add excerpts from original bug reports, 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.
Stefano Lattarini [Wed, 14 Jul 2010 13:22:12 +0000 (15:22 +0200)]
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.
Stefano Lattarini [Fri, 18 Jun 2010 10:12:54 +0000 (12:12 +0200)]
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: Improve the generated `configure.in' file.
Prefer perl over pipelined grep. Made stricter. Other changes,
cosmetic and not.
Stefano Lattarini [Wed, 14 Jul 2010 12:01:43 +0000 (14:01 +0200)]
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.
Stefano Lattarini [Fri, 18 Jun 2010 23:32:14 +0000 (01:32 +0200)]
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.
Stefano Lattarini [Wed, 14 Jul 2010 11:33:49 +0000 (13:33 +0200)]
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.
Stefano Lattarini [Sun, 27 Jun 2010 14:34:42 +0000 (16:34 +0200)]
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.
Stefano Lattarini [Wed, 14 Jul 2010 11:10:09 +0000 (13:10 +0200)]
Remove a couple of obsoleted tests.
* tests/fpinstall.test: Removed.
* tests/fpinst2.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
Stefano Lattarini [Sun, 8 Aug 2010 10:05:45 +0000 (12:05 +0200)]
Bootstrap: updated HACKING entry.
* HACKING ("Working with git"): Tell how to override the autoconf
and autom4te used by the bootstrap process.
Stefano Lattarini [Wed, 28 Jul 2010 09:02:50 +0000 (11:02 +0200)]
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.
Stefano Lattarini [Tue, 27 Jul 2010 20:50:38 +0000 (22:50 +0200)]
Bootstrap: don't search perl in $PATH.
* bootstrap: Do not explicitly search perl in $PATH anymore.
($PATH_SEPARATOR): Removed, it's no more needed.
Stefano Lattarini [Tue, 27 Jul 2010 20:44:54 +0000 (22:44 +0200)]
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.
Stefano Lattarini [Wed, 14 Jul 2010 11:41:05 +0000 (13:41 +0200)]
Minor improvements to tests ar*.test.
* tests/ar.test: Add trailing `:' command.
* tests/ar2.test: Likewise, and make grepping of generated
Makefile.in stricter.
Ralf Wildenhues [Mon, 9 Aug 2010 19:36:32 +0000 (21:36 +0200)]
Merge branch 'msvc'
* msvc:
Add new auxiliary 'ar-lib' script, wrapping Microsoft lib.
Fix shell pattern negation in compile script.
Peter Rosin [Sun, 1 Aug 2010 06:38:05 +0000 (08:38 +0200)]
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 8 Aug 2010 20:32:23 +0000 (22:32 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 8 Aug 2010 20:30:41 +0000 (22:30 +0200)]
Fix maintainer-check failure.
* tests/cond5.test: Quote sleep argument, this isn't about
time stamp differences.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 8 Aug 2010 19:10:48 +0000 (21:10 +0200)]
Sync auxiliary files from upstream.
* lib/config.guess, lib/config.sub, lib/texinfo.tex:
Sync from upstream.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 8 Aug 2010 11:01:25 +0000 (13:01 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 8 Aug 2010 11:00:11 +0000 (13:00 +0200)]
Regenerate tree with Autoconf 2.67.
Ralf Wildenhues [Sat, 7 Aug 2010 05:54:38 +0000 (07:54 +0200)]
Fix shell pattern negation in compile script.
* lib/compile (func_file_conv): Use `!' not `^' for pattern
negation.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 6 Aug 2010 19:44:01 +0000 (21:44 +0200)]
Merge branch 'maint'
Conflicts:
HACKING
Stefano Lattarini [Fri, 6 Aug 2010 19:36:33 +0000 (21:36 +0200)]
Typofix in ChangeLog (2010-07-18, Stefano Lattarini)
Stefano Lattarini [Thu, 5 Aug 2010 22:40:55 +0000 (00:40 +0200)]
Work around a nasty bug (segfault) of Solaris make.
* lib/am/check.am (recheck, recheck-html): Trim trailing spaces
from $list, to avoid triggering a nasty bug (potential segfault)
on Solaris make.
Stefano Lattarini [Fri, 6 Aug 2010 09:47:55 +0000 (11:47 +0200)]
Fixlets and minor improvements for HACKING.
* HACKING: Add some missing fullstops in sentences. Remove
some extra empty lines, for consistency.
(Test suite): Add pointer to `tests/README'.
(Admistrivia): Tell to mention important bug fixes in NEWS.
Peter Rosin [Fri, 6 Aug 2010 17:11:53 +0000 (19:11 +0200)]
Make cond5.test more robust on MSYS.
* tests/cond5.test: Add delay before the first kill attempt to
cater for problems with MSYS bash.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 1 Aug 2010 07:38:34 +0000 (09:38 +0200)]
Merge branch 'msvc'
* msvc:
Wrap some MSVC options in the compile script.
Peter Rosin [Sun, 1 Aug 2010 06:38:05 +0000 (08:38 +0200)]
Wrap some MSVC options in the compile script.
* lib/compile: MSVC supports naming the output file, the option
is just not called -o, so transform -o into the appropriate form
for MSVC. Also wrap some other options while at it (-L, -l, -Wl,
-Xlinker and -I) and convert file names to windows form where
needed for those options to make MSVC more usable in an
autotooled environment.
* doc/automake.texi (Auxiliary Programs): Document the above
extension of the compile script.
* NEWS: Updated.
* tests/defs.in: New required entry 'cl'.
* tests/compile3.test: New test.
* tests/compile4.test: New test.
* tests/compile5.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 31 Jul 2010 15:02:43 +0000 (17:02 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 31 Jul 2010 15:00:48 +0000 (17:00 +0200)]
Add example git work flow; discuss merge --log in HACKING.
* HACKING: Update.
Suggestion by Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 31 Jul 2010 12:16:15 +0000 (14:16 +0200)]
Add more hints for debugging make rules.
* doc/automake.texi (Debugging Make Rules): Show command to find
out expanded values of variables; point to makefile debugger.
* THANKS: Update.
Prompted by suggestion from Ludovic Courtès and Andy Wingo.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Patrick Welche [Tue, 27 Jul 2010 19:54:33 +0000 (21:54 +0200)]
Fix typo in the manual.
* doc/automake.texi (Scripts): Fix typo.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 27 Jul 2010 19:46:25 +0000 (21:46 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Tue, 27 Jul 2010 19:39:25 +0000 (21:39 +0200)]
Document current policy for development with git.
* HACKING (Working with git): Overhaul.
Prompted by suggestion from Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 27 Jul 2010 19:35:19 +0000 (21:35 +0200)]
Fix AM_COND_IF for gone-invalid condition shell expression.
* m4/cond-if.m4 (AM_COND_IF): test contents of $COND_TRUE
variable, rather than re-evaluating the shell expression for
the condition.
* tests/cond40.test: Extend test.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 27 Jul 2010 19:20:04 +0000 (21:20 +0200)]
Avoid syntax error if IF-TRUE part of AM_COND_IF expands empty.
* m4/cond-if.m4 (AM_COND_IF): Ensure IF-TRUE part is never empty
to avoid shell syntax error if the m4 expansion is empty.
* tests/cond40.test: Enhance test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 27 Jul 2010 19:12:42 +0000 (21:12 +0200)]
Coverage: bogus option to AM_INIT_AUTOMAKE.
* tests/init2.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Mon, 26 Jul 2010 17:35:44 +0000 (19:35 +0200)]
Merge branch 'maint'
Conflicts: tests/distcom7.test
Stefano Lattarini [Sun, 25 Jul 2010 21:23:15 +0000 (23:23 +0200)]
Fixed typo in ChangeLog (2010-06-06, Stefano Lattarini)
Stefano Lattarini [Sat, 19 Jun 2010 12:55:10 +0000 (14:55 +0200)]
Modernize and improve test scripts `subdir*.test'.
* tests/subdir.test: Enable `errexit' shell flag, and related
changes. Use the `configure.in' stub created by `./defs',
rather than writing one from scratch.
* tests/subdir2.test: Likewise.
* tests/subdir4.test: Likewise.
* tests/subdir3.test: Enable `errexit' shell flag, and related
changes. Do not create useless dummy source files.
* tests/subdir5.test: Make grepping of Makefile.in (in topdir
and in subdirs) stricter. Some minor changes to keep it more
in sync with the related test `subdir8.test'.
* tests/subdir8.test: Likewise (but with the related test being
`subdir5.test' here).
* tests/subdir6.test: Cosmetic change in spacing.
* tests/subdir9.test: Define and use new variable `$distdir'. Add
trailing `:' command.
* tests/subdir10.test: Cosmetic consistency-related change.
* tests/subdirbuiltsources.test: Cosmetic changes in spacings.
(configure.in): Use stub created by `./defs', rather than writing
it from scratch. Do not use obsoleted and/or deprecated forms of
autoconf/automake macros.
Stefano Lattarini [Sat, 19 Jun 2010 09:25:26 +0000 (11:25 +0200)]
Modernize and improve test scripts `dist*.test'.
* tests/distcleancheck.test: Do not add useless `-e' option to
a $MAKE call. Extend test by grepping stderr of make.
* tests/distcom2.test: Do not run the same test script on the
Makefile.in twice, but save its output in an intermediate file
instead. Make grepping of DIST_COMMON definition stricter.
Display the content of more files, to ease debugging. Add a
trailing `:' command. Improved heading comments w.r.t. sister
test(s).
* tests/distcom6.test: Likewise, and avoid to uselessly run
autoconf.
* tests/distcom3.test: Ensure verbose printing of captured stdout
and stderr. Make grepping of captured stderr stricter. Also,
add trailing `:' command.
* tests/distcom4.test: Declare the target `test' in the generated
Makefile.am as `.PHONY'. Display content of more files, to ease
debugging. Add trailing `:' command.
* tests/distcom5.test: Likewise. Also, factor out common sed
script in subroutine `extract_distcommon'.
* tests/distcom7.test: Prefer cat + here-doc over echo to write
test Makefile.am files. Add a trailing `:' command.
* tests/distname.test: Prefer `gzip -d' over `gunzip'. Move the
call to `set -e' earlier. Be stricter and more verbose in the
checking of the generated tarball.
(configure.in): Use the stub provided by ./defs, instead of
writing it from scratch. Avoid obsoleted constructs. Remove
useless call to `AM_PROG_CC_C_O'.
* tests/distdir.test: Various minor improvements/normalizations.
* tests/distlinks.test: Likewise.
Stefano Lattarini [Sun, 18 Jul 2010 10:45:46 +0000 (12:45 +0200)]
Merge branch 'maint'
Stefano Lattarini [Thu, 3 Jun 2010 17:37:21 +0000 (19:37 +0200)]
Improve and extend test cond5.test.
* tests/cond5.test: Do not blindly sleep 60 seconds before polling
the background automake process, but poll it every 10 seconds for
at most 30 times (this makes the test both faster on good machines,
and more resilient to spurious timeout-due failures when in low
priority or on havily-loaded systems).
Check also that automake writes the expected error messages on the
standard error.
Enable `errexit' flag, and related changes.
Rely on the `configure.in' stub created by `./defs', rather than
writing one from scratch.
Ralf Wildenhues [Sat, 26 Jun 2010 20:23:31 +0000 (22:23 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 26 Jun 2010 20:10:21 +0000 (22:10 +0200)]
Update program --help output to match current GCS.
* configure.ac: Set and substitute PACKAGE_URL if AC_PACKAGE_URL
is not defined, for compatibility to Autoconf < 2.64.
* Makefile.am (do_subst): Substitute PACKAGE_BUGREPORT and
PACKAGE_URL.
(sc_diff_automake_in_automake): Update number of diff lines for
additional substitutions.
* aclocal.in (usage): Use PACKAGE_BUGREPORT. Point to Automake
home page and GNU general help page.
* automake.in (usage): Likewise.
* doc/automake.texi: New flag PACKAGE_BUGREPORT, to factor email
address.
(Introduction, Creating amhello, amhello Explained, Options):
Use it throughout.
* lib/Automake/Makefile.am (do_subst): Substitute
PACKAGE_BUGREPORT.
* lib/Automake/Config.in ($PACKAGE_BUGREPORT): New global.
* lib/Automake/ChannelDefs.pm: Use it for footer of fatal
messages.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 26 Jun 2010 20:07:12 +0000 (22:07 +0200)]
Clean up @var handling in the manual.
* doc/automake.texi: Throughout the manual, lower-case @var
names, replace a few one-character names.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 26 Jun 2010 12:12:07 +0000 (14:12 +0200)]
Fix typo-related bug in test script silent5.test.
* tests/silent5.test: Use $EGREP, not $GREP (which is not even
defined).
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 25 Jun 2010 15:19:44 +0000 (17:19 +0200)]
Tests: remove useless repetitions of `foreign' automake option.
* tests/multlib.test (configure.in): Remove useless use of
`foreign' option in AM_INIT_AUTOMAKE (the `--foreign' option is
already in $AUTOMAKE by default, so no point in repeating it).
* tests/subobj10.test: Likewise.
* tests/subobj9.test: Likewise.
* tests/lex3.test (Makefile.am): Similarly, remove useless use
of `foreign' option in AUTOMAKE_OPTIONS.
* tests/lex5.test: Likewise.
* tests/pr279.test: Likewise.
* tests/pr279-2.test: Likewise.
* tests/specflg3.test: Likewise.
* tests/target-cflags.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 25 Jun 2010 15:30:36 +0000 (17:30 +0200)]
Drop useless requirement "gzip" in lex5.test.
* tests/lex5.test ($required): Do not list "gzip", as it's
never used.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Thu, 24 Jun 2010 19:37:04 +0000 (21:37 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Thu, 24 Jun 2010 19:33:09 +0000 (21:33 +0200)]
Merge branch 'sl-yacc-work' into maint
* sl-yacc-work:
Fix minor testsuite issues, update docs, for Yacc/Lex changes.
Bugfix: $(AM_FLAGS)/$(FLAGS) precedence in Yacc/Lex.
New tests, for bugs in Yacc/Lex AM_FLAGS and FLAGS precedence.
Ralf Wildenhues [Thu, 24 Jun 2010 18:28:55 +0000 (20:28 +0200)]
Merge branch 'silent5-fix' into maint
* silent5-fix:
Fix bugs in test script silent5.test.
Stefano Lattarini [Wed, 23 Jun 2010 19:56:04 +0000 (21:56 +0200)]
Fix bugs in test script silent5.test.
* tests/silent5.test: Fixed a nasty bug (due to the use of grep
instead of egrep) that could have led to false negatives.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 15 May 2010 13:40:16 +0000 (15:40 +0200)]
New test: distributed broken symlinks cause failure.
* tests/distlinksbrk.test: New test.
* tests/Makefile.am (TESTS): Updated accordingly.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 21 Jun 2010 19:08:13 +0000 (21:08 +0200)]
Merge branch 'sl-yacc-work'
* sl-yacc-work:
Fix minor testsuite issues, update docs, for Yacc/Lex changes.
Bugfix: $(AM_FLAGS)/$(FLAGS) precedence in Yacc/Lex.
New tests, for bugs in Yacc/Lex AM_FLAGS and FLAGS precedence.
Ralf Wildenhues [Mon, 21 Jun 2010 18:56:08 +0000 (20:56 +0200)]
Fix minor testsuite issues, update docs, for Yacc/Lex changes.
* doc/automake.texi (Yacc and Lex): Mention AM_YFLAGS, YFLAGS
and AM_LFLAGS, LFLAGS in the order in which they now appear in
the rules.
* NEWS: Update.
* tests/lflags.test, tests/lflags2.test, tests/yflags.test,
tests/yflags2.test: Prefer `make -e' over `make VAR=VAL', to
please maintainer-check. Ensure generated C files contain a
declaration, to please compilers.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 8 Jun 2010 14:32:40 +0000 (16:32 +0200)]
Bugfix: $(AM_FLAGS)/$(FLAGS) precedence in Yacc/Lex.
* automake.in: Fix registration of languages "Lex", "Lex (C++)",
"Yacc" and "Yacc (C++)", so that $(LFLAGS) has precedence over
$(AM_LFLAGS) and $(YFLAGS) has precedence over $(AM_YFLAGS).
* tests/Makefile.am (XFAIL_TESTS): Updated accordingly.
* NEWS: Updated.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 8 Jun 2010 14:32:40 +0000 (16:32 +0200)]
New tests, for bugs in Yacc/Lex AM_FLAGS and FLAGS precedence.
* tests/lflags.test: New test, check that user $(LFLAGS) takes
precedence over automake (AM_LFLAGS) and (foo_LFLAGS). Still
xfailing.
* tests/lflags2.test: Likewise.
* tests/yflags.test: New test, check that user $(YFLAGS) takes
precedence over automake (AM_YFLAGS) and (foo_YFLAGS). Still
xfailing.
* tests/yflags2.test: Likewise.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Extended accordingly.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 20 Jun 2010 18:32:53 +0000 (20:32 +0200)]
Merge branch 'maint'
Stefano Lattarini [Sat, 19 Jun 2010 15:32:31 +0000 (17:32 +0200)]
Modernize, improve and extend tests `suffix*.test'.
* tests/suffix3.test: Enable `errexit' shell flag, and related
changes.
* tests/suffix4.test: Likewise.
* tests/suffix6.test: Likewise, and do not create a useless dummy
source file.
* tests/suffix7.test: Likewise.
* tests/suffix5.test: Enable `errexit' shell flag, and related
changes. Make grepping of Makefile.in slighty stricter.
* tests/suffix.test: Enable `errexit' shell flag, and related
changes. Also, do not redirect grep output to /dev/null, as this
might unmotivatedly hide useful information.
* tests/suffix2.test: Move setting of `errexit' shell flag earlier
in the script (just after inclusion of ./defs). Use a more
idiomatic way to count text occurrences in Makefile.in with
grep. Do not create useless dummy source files.
* tests/suffix10.test: Ensure verbose printing of captured make
stdout. Minor cosmetic changes.
* tests/suffix8.test: Likewise. Also, drop useless call to the
env(1) utility, and make grepping of make output stricter by using
$FGREP rather than plain grep.
* tests/suffix11.test: Likewise.
* tests/suffix12.test: Likewise.
* tests/suffix9.test: Prefet cat + here-doc over echo to append to
the `configure.in' stub. Cosmetic changes.
* tests/suffix13.test: Cosmetic spacing change.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 13 Jun 2010 20:37:39 +0000 (22:37 +0200)]
Add useful comment in test script ext.test.
* tests/ext.test: Add a comment explaining why an apparently
useless `if' statement is indeed required.
Ralf Wildenhues [Sun, 13 Jun 2010 17:22:27 +0000 (19:22 +0200)]
Merge branch 'maint'
Stefano Lattarini [Sat, 12 Jun 2010 18:32:00 +0000 (20:32 +0200)]
Add useful comment in test script obsolete.test.
* tests/obsolte.test: Add a comment explaining why we need
an indirection in adding $AUTOUPDATE to $required.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Wed, 9 Jun 2010 00:59:22 +0000 (02:59 +0200)]
Normalize whitespaces in 'tests/Makefile.am'.
* tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
definition of this variable.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 13 Jun 2010 17:18:52 +0000 (19:18 +0200)]
Merge branch 'fix-distcheck'
* fix-distcheck:
Parallel tests generation: improve comments (tiny change).
Tests defs: truly get rid of `$am_defs_included' (unused variable)
Stefano Lattarini [Wed, 9 Jun 2010 00:57:24 +0000 (02:57 +0200)]
Parallel tests generation: improve comments (tiny change).
* tests/Makefile.am ($(parallel_tests)): Added useful comment to
generated tests.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>