Ralf Wildenhues [Sat, 15 Jan 2011 13:54:51 +0000 (14:54 +0100)]
docs: ensure example are separated with empty lines in the input
* doc/automake.texi (Extending aclocal, Emacs Lisp, Rebuilding)
(API Versioning, Renamed Objects, Multiple Outputs): Add empty
lines before `@example' and after `@end example' lines, so info
output is rendered correctly, and a following @noindent honored.
Report by Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Jim Meyering [Thu, 14 Oct 2010 14:39:22 +0000 (16:39 +0200)]
tests: fix comment typo
* tests/substref.test: Fix grammar in a comment.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 13 Jan 2011 20:35:05 +0000 (21:35 +0100)]
Merge branch 'tests-texinfo' into maint
Stefano Lattarini [Thu, 13 Jan 2011 19:56:04 +0000 (20:56 +0100)]
tests: fix spurious failures in two texinfo tests
* tests/txinfo.test ($required): Add 'makeinfo'.
* tests/txinfo8.test: Create a dummy 'textutils.info' file, so
that make won't try to run makeinfo (which could be unavailable)
to build it.
Found by NixOS Hydra, reported by Ralf Wildenhues.
Ralf Wildenhues [Thu, 13 Jan 2011 19:21:39 +0000 (20:21 +0100)]
Avoid testsuite failures due to Autoconf Fortran change.
Autoconf v2.68-21-g727ce95 causes AC_F77_LIBRARY_LDFLAGS to
require computing the canonical host name. Ensure config.guess
and config.sub files are present for respective checks.
* tests/compile_f_c_cxx.test: Add stub files.
* tests/flibs.test: Likewise.
* tests/fort4.test: Use $AUTOMAKE -a for installing files.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Wed, 12 Jan 2011 22:44:02 +0000 (23:44 +0100)]
Merge branch 'doc-yacc-d-improve' into maint
Stefano Lattarini [Wed, 12 Jan 2011 12:23:59 +0000 (13:23 +0100)]
docs: clustered '-d' not recognized in YFLAGS
This commit fixes automake bug#7828.
* doc/automake.texi (Yacc and Lex): Document that automake
recognizes '-d' in AM_YFLAGS only if it's not clustered with
other options.
From a report by Юрий Пухальский.
Stefano Lattarini [Tue, 11 Jan 2011 21:50:21 +0000 (22:50 +0100)]
Merge branch 'tests-autodist' into maint
Stefano Lattarini [Mon, 10 Jan 2011 22:56:43 +0000 (23:56 +0100)]
tests: add checks on automatically-distributed files
Related to automake bug#7819.
* tests/autodist.test: New test.
* tests/autodist-subdir.test: Likewise.
* tests/autodist-acconfig.test: Likewise.
* tests/autodist-acconfig-no-subdir.test: Likewise.
* tests/autodist-aclocal-m4.test: Likewise.
* tests/autodist-config-headers.test: Likewise.
* tests/autodist-configure-no-subdir.test: Likewise.
* tests/autodist-stamp-vti.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Tue, 11 Jan 2011 12:12:05 +0000 (13:12 +0100)]
tests: work around a texi+cygnus bug causing a spurious XFAIL
* tests/txinfo5b.test: New test, like txinfo5.test but calling
automake with the `-Wno-override' option to work around a bug
in the texinfo + cygnus interaction.
* tests/txinfo5.test: Update heading comments.
* tests/Makefile.am (TEST): Updated.
Dave Hart [Sun, 9 Jan 2011 18:05:07 +0000 (19:05 +0100)]
Fix another typo in Rule.pm comment.
* lib/Automake/Rule.pm: Fix typo.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 11 Jan 2011 01:27:30 +0000 (02:27 +0100)]
Merge branch 'maint' of ssh://git.sv.gnu.org/srv/git/automake into maint
Apparently I messed up doing a previous 'git pull', so that the "latest"
maint I've merged into master (and pushed!) wasn't a fast-forward from
origin/maint. Yay for me. This merge should help cleaning up the mess.
Stefano Lattarini [Tue, 11 Jan 2011 00:59:29 +0000 (01:59 +0100)]
Merge branch 'tests-texinfo' into maint
Stefano Lattarini [Fri, 24 Dec 2010 01:56:35 +0000 (02:56 +0100)]
Improve, extend and tweak tests on Texinfo support.
* tests/instdir-texi.test: Add a call to `ls -l' after that to
`make', for debugging. When looking for required tools, do not
redirect the output of "$tool --help" to /dev/null, and do not
uselessly run it in a subshell.
* tests/txinfo.test: Rewritten to run autoconf, ./configure and
make. All checks moved into Makefile.am.
* tests/txinfo8.test: Likewise, and modernize the generated
configure.in.
* tests/txinfo2.test: Moved checks into Makefile.am, and other
minor improvements.
* tests/txinfo5.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command.
* tests/txinfo6.test: Likewise, and make grepping of generated
Makefile.in stricter.
* tests/txinfo7.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Do not add unnecessary stuff
to Makefile.am.
* tests/txinfo9.test: Verify that more targets which are expected
to be generated only once really are. Make grepping less strict,
to avoid exposing too much internal details. More minor changes.
* tests/txinfo16.test: Add trailing `:'. Prefer cat over echo
for appending to configure.in. Updated/fixed heading comments.
* tests/txinfo23.test: Likewise, and extended a little by making
it check that no info file is created in the $(srcdir).
* tests/txinfo24.test: Likewise.
* tests/txinfo25.test: Likewise.
* tests/txinfo18.test: Add trailing `:'. Prefer cat over echo
for appending to configure.in. Also, check that index files are
cleaned also by "make clean", not only by "make distclean".
* tests/txinfo22.test: Prefer `$me' over hard-coded test name,
and added trailing `:' command. This testcase also used to check
that automake ignores in-line comments when using variables, but
preserves them in the output; these checks (added in commit
"Release-1-7f-4-g9177ef8") do not really pertain to this test,
so they have been moved ...
* tests/comments-in-var-defn.test: ... into this new test.
* tests/txinfo4.test: Escape literal dots in grep regexps. Add
trailing `:' command.
* tests/txinfo29.test: Likewise. Relax grepping of generated
Makefile.in w.r.t. whitespaces. Prefer `cat' over `echo' to
append to configure.in.
* tests/txinfo3.test: Likewise.
* tests/vtexi.test: Improve grepping of Makefile.in (sometimes
make it stricter, sometimes laxer). Move `set -e' setting just
after the inclusion of ./defs. De-uglify a sed command. Other
minor cosmetic improvements.
* tests/vtexi2.test: Make grepping of Makefile.in stricter. Add
trailing `:' command.
* tests/vtexi3.test: New test on version.texi support.
* tests/vtexi4.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
Peter Rosin [Sun, 9 Jan 2011 17:54:36 +0000 (18:54 +0100)]
Fix another typo in Rule.pm comment.
* lib/Automake/Rule.pm: Fix typo.
Report by Peter Rosin.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 9 Jan 2011 14:22:32 +0000 (15:22 +0100)]
cosmetics: remove trailing whitespaces
* doc/automake.texi: Remove trailing whitespaces.
* tests/cond13.test: Likewise.
* tests/cond14.test: Likewise.
* tests/fort4.test: Likewise.
* tests/fort5.test: Likewise.
* tests/suffix7.test: Likewise.
* tests/vtexi2.test: Likewise.
Stefano Lattarini [Sat, 8 Jan 2011 12:04:10 +0000 (13:04 +0100)]
automake: minor fixes in comments
* automake.in: Some minor fixes and enhancements in comments.
Ralf Wildenhues [Sun, 9 Jan 2011 11:06:24 +0000 (12:06 +0100)]
Add test coverage for deleted header files.
* tests/depcomp6.test, tests/depcomp7.test: Update tests to
also check for the deleted header bug. If no dependency
tracking mechanism could be found, SKIP rather than exit
successfully. Use GNU style spacing and ANSI C prototypes.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 9 Jan 2011 09:53:04 +0000 (10:53 +0100)]
Fix typos in Rule.pm comments.
* lib/Automake/Rule.pm: Fix typos in comments.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 8 Jan 2011 19:18:03 +0000 (20:18 +0100)]
docs: split 'amhello Explained' node.
* doc/automake.texi (amhello Explained): Split node ...
(amhello's configure.ac Setup Explained)
(amhello's Makefile.am Setup Explained) : ... into these two.
(Top, Hello World): Adjust, and add @anchor for stable URL links.
Suggestion by Karl Berry in automake bug#7766.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Karl Berry [Sat, 8 Jan 2011 09:04:17 +0000 (10:04 +0100)]
docs: reference defining directories in amhello node.
* doc/automake.texi (amhello Explained): Point to Autoconf
manual for how to convert directory values into macros.
(Optional): Fix grammar nit.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 2 Jan 2011 13:17:12 +0000 (14:17 +0100)]
* NEWS: Fix typo (forgotten word).
Stefano Lattarini [Fri, 24 Dec 2010 21:00:40 +0000 (22:00 +0100)]
docs: how to work around checks on invalid primary/directory couples
* doc/automake.texi (Uniform): Document the blessed idiom which can
be used to work around automake checks on invalid primary/directory
couples (such as `lib_PROGRAMS' or `doc_LIBRARIES').
Suggested by Ralf Wildenhues.
Ralf Wildenhues [Sun, 2 Jan 2011 05:11:28 +0000 (06:11 +0100)]
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, 2 Jan 2011 04:36:20 +0000 (05:36 +0100)]
Fix maintainer-check regression.
* tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
environment.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 2 Jan 2011 04:31:41 +0000 (05:31 +0100)]
Bump copyright years.
* aclocal.in (write_aclocal, version): Bump copyright years.
* automake.in (gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 14 May 2010 19:19:32 +0000 (21:19 +0200)]
Work around a bug in file-inclusion mechanism of Solaris make.
* automake.in (handle_single_transform): In the name of the
dependency file: collapse multiple slash characters into a single
one.
* tests/subobj11a.test: New test.
* tests/subobj11b.test: Likewise.
* tests/subobj11c.test: Likewise.
* tests/depcomp8a.test: Likewise.
* tests/depcomp8b.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
* NEWS: Updated.
Report by Stefano Lattarini, quick fix by Ralf Wildenhues, final
patch and tests by Stefano Lattarini.
Stefano Lattarini [Tue, 16 Nov 2010 21:28:26 +0000 (22:28 +0100)]
Fix two spurious testsuite failures on IRIX 6.5.
* tests/suffix13.test (Makefile.am): Account for VPATH issues on
weaker make implementations (e.g. IRIX 6.5).
* tests/parallel-tests8.test: Likewise, plus a required related
change.
Reported by Ralf Wildenhues. The bugs have been there from the
first versions of the affected test scripts.
Stefano Lattarini [Tue, 21 Dec 2010 23:08:53 +0000 (00:08 +0100)]
docs: cygnus mode doesn't require AM_CYGWIN32 macro.
* doc/automake.texi (Cygnus): Mode 'cygnus' does not require
the AM_CYGWIN32 macro (and indeed hasn't required it since at
least commit Release-1-2-31-g3038064 "merged changes from
Cygnus" of 1997-08-25).
Stefano Lattarini [Tue, 21 Dec 2010 14:39:37 +0000 (15:39 +0100)]
Merge branch 'fix-test-distlinksbrk-botched-make-k' into maint
Stefano Lattarini [Tue, 21 Dec 2010 14:38:08 +0000 (15:38 +0100)]
distlinksbrk.test: Work around botched "make -k".
* tests/distlinksbrk.test: Run "make" multiple times and grep
its output each time for a single error message, rather than
running "make -k" one single time and grepping its output for
all the expected error messages. This should work around make
implementations with limited (broken?) `-k' support; for more
information, see these subthreads on the automake-patches list:
- 2010-11-15, "Testsuite failures on HP-UX 11.23",
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00162.html>
- 2010-11-15, "Testsuite failures on IRIX 6.5",
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00166.html>
Stefano Lattarini [Tue, 21 Dec 2010 01:00:40 +0000 (02:00 +0100)]
Fix sed-related buglet in test "subdir5.test"
* tests/subdir5.test: Always terminate text passed to the
`i' sed command with a newline, to work around limitations
in e.g. older OpenBSD sed.
Stefano Lattarini [Sat, 18 Dec 2010 11:17:14 +0000 (12:17 +0100)]
docs: fix blunder in example about python extension modules
* doc/automake.texi (Python): Use `quaternion_la_SOURCES',
not `quaternion_SOURCES', to declare the sources of python
extension module `quaternion.la'.
Stefano Lattarini [Thu, 16 Dec 2010 18:47:36 +0000 (19:47 +0100)]
docs: list LTLIBRARIES among Automake primaries
* doc/automake.texi (Uniform): List `LTLIBRARIES' among
the Automake primaries.
Stefano Lattarini [Sun, 12 Dec 2010 13:17:41 +0000 (14:17 +0100)]
Improve tests on generated portions of configure help screen.
* tests/help-depend.test: Grepping of configure help screen
relaxed to cater for possible line wrapping, and tightened in
other respects.
* tests/help-depend2.test: Likewise.
* tests/help-dmalloc.test: Likewise.
* tests/help-lispdir.test: Likewise.
* tests/help-maintainer.test: Likewise.
* tests/help-multilib.test: Likewise.
* tests/help-silent.test: Likewise.
* tests/help-upc.test: Likewise.
* tests/help-init.test: Grepping of configure help screen
tightened.
Ralf Wildenhues [Fri, 10 Dec 2010 06:39:04 +0000 (07:39 +0100)]
Avoid running installed automake from 'libtool --help'.
* tests/subobj9.test: Export AUTOCONF and AUTOMAKE.
Together with fixed Libtool, this fixes check-coverage to not
invoke installed automake.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 27 Nov 2010 10:00:24 +0000 (11:00 +0100)]
Fix typo in ChangeLog
Stefano Lattarini [Thu, 25 Nov 2010 21:06:14 +0000 (22:06 +0100)]
Fix spurious silent*.test failures for $CC != gcc
In some tests on automake-produced silent rules, we forced the
use of gcc depmode to improve testsuite coverage; but this has
unsurprisingly led to spurious failures when some non-GNU C
compilers were used. So we are now careful to require GCC in
tests that force gcc depmode.
From reports by Ralf Wildenhues.
* silent5.test: Test removed, its content split into ...
* silent-many-generic.test, silent-many-gcc.test: ... these new
sister tests, the latter of which forces gcc depmode and lists
"gcc" in $required.
* silentlex.test: Test removed, its content split into ...
* silent-lex-generic.test, silent-lex-gcc.test: ... these new
sister tests, the latter of which forces gcc depmode and lists
"gcc" in $required.
* silentyacc.test: Test removed, its content split into ...
* silent-yacc-generic.test, silent-yacc-gcc.test: ... these new
sister tests, the latter of which forces gcc depmode and lists
"gcc" in $required.
* tests/Makefile.am (TESTS): Updated.
Stefano Lattarini [Thu, 25 Nov 2010 11:16:45 +0000 (12:16 +0100)]
Fix many typos in ChangeLog
Stefano Lattarini [Sun, 21 Nov 2010 15:25:45 +0000 (16:25 +0100)]
Tests: consistently use "|| Exit 1" after ". ./defs".
The test scripts below has been modified with this command:
$ sed -i 's/^\. \.\/defs *$/& || Exit 1/' tests/*.test
* tests/autohdr.test: Use `. ./defs || Exit 1', not bare
`. ./defs', for consistency with other tests.
* tests/autohdr2.test: Likewise.
* tests/autohdr3.test: Likewise.
* tests/autohdr4.test: Likewise.
* tests/cond23.test: Likewise.
* tests/cond24.test: Likewise.
* tests/cond25.test: Likewise.
* tests/cond26.test: Likewise.
* tests/cond27.test: Likewise.
* tests/cond28.test: Likewise.
* tests/cond29.test: Likewise.
* tests/cond30.test: Likewise.
* tests/cond31.test: Likewise.
* tests/cond32.test: Likewise.
* tests/cond33.test: Likewise.
* tests/cond34.test: Likewise.
* tests/cond35.test: Likewise.
* tests/cond36.test: Likewise.
* tests/cond37.test: Likewise.
* tests/cond38.test: Likewise.
* tests/cond39.test: Likewise.
* tests/cond40.test: Likewise.
* tests/cond41.test: Likewise.
* tests/cond42.test: Likewise.
* tests/cond43.test: Likewise.
* tests/cond44.test: Likewise.
* tests/cond45.test: Likewise.
* tests/dollarvar.test: Likewise.
* tests/dollarvar2.test: Likewise.
* tests/hfs.test: Likewise.
* tests/libobj14.test: Likewise.
* tests/percent.test: Likewise.
* tests/percent2.test: Likewise.
* tests/phony.test: Likewise.
* tests/silent.test: Likewise.
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent6.test: Likewise.
* tests/silent7.test: Likewise.
* tests/silent9.test: Likewise.
* tests/silentcxx.test: Likewise.
* tests/silentf77.test: Likewise.
* tests/silentf90.test: Likewise.
* tests/silentlex.test: Likewise.
* tests/silentyacc.test: Likewise.
Stefano Lattarini [Sun, 21 Nov 2010 14:46:20 +0000 (15:46 +0100)]
Avoid useless cleaning in some `silent*.test' tests.
* tests/silentf77.test: Removed useless calls to "make clean"
and "make maintainer-clean".
* tests/silentf90.test: Likewise.
* tests/silent3.test: Removed useless call to "make distclean".
* tests/silent4.test: Likewise.
* tests/silent9.test: Likewise.
Ian Lance Taylor [Fri, 19 Nov 2010 20:50:31 +0000 (21:50 +0100)]
Sync config-ml.in from GCC.
* config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
compiler/flag environment variables.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 19 Nov 2010 19:24:28 +0000 (20:24 +0100)]
Automake::Config: remove extra trailing semicolon.
* lib/Automake/Config.in: Remove extra trailing semicolon.
Stefano Lattarini [Fri, 19 Nov 2010 18:52:48 +0000 (19:52 +0100)]
help4.test: fix botched heading comment.
* tests/help4.test: Fixed the heading comment, since it
didn't correctly describe what checks the testcase was
supposed to perform.
Stefano Lattarini [Fri, 19 Nov 2010 18:43:28 +0000 (19:43 +0100)]
help2.test: add checks on aclocal too.
* tests/help2.test: Check that also `aclocal --version' and
`aclocal --help' work with configure.in and acinclude.m4 both
broken.
Stefano Lattarini [Wed, 17 Nov 2010 19:19:19 +0000 (20:19 +0100)]
Merge branch 'fix-silentf77-sun-fortran' into maint
Stefano Lattarini [Wed, 17 Nov 2010 19:19:14 +0000 (20:19 +0100)]
Merge branch 'fix-silent5-sun-fortran' into maint
Stefano Lattarini [Wed, 17 Nov 2010 14:18:49 +0000 (15:18 +0100)]
Fix spurious failures of silent5.test with Sun Fortran.
* tests/silent5.test: Strip from the make output some verbose
messages possibly printed by the SunStudio fortran compilers,
to avoid spurious failures. This bug has been there from the
very first version of this test script.
Stefano Lattarini [Wed, 17 Nov 2010 14:07:39 +0000 (15:07 +0100)]
Fix spurious failures of silent-rules tests with Sun Fortran.
* tests/silentf77.test: Strip from the make output some verbose
messages possibly printed by the SunStudio fortran compilers, to
avoid spurious failures. Add a trailing `:' command.
* tests/silentf90.test: Likewise.
Stefano Lattarini [Tue, 16 Nov 2010 19:59:21 +0000 (20:59 +0100)]
Merge branch 'fix-colon-tests-regression-on-aix' into maint
Stefano Lattarini [Tue, 16 Nov 2010 19:59:21 +0000 (20:59 +0100)]
Merge branch 'fix-ansi-test-regression-on-aix' into maint
Stefano Lattarini [Tue, 16 Nov 2010 19:02:54 +0000 (20:02 +0100)]
Fix regression in colon{5,6}.test (failures on AIX 5.3).
* tests/colon5.test: Also substitute `@SHELL@' with `$SHELL' when
post-processing the generated Makefile.in, to work around a bug
of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
on the commend line. Calls to `$MAKE' adjusted accordingly.
* tests/colon6.test: Likewise.
Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
improve and/or extend tests `colon*.test", and reported by Ralf
Wildenhues.
Ralf Wildenhues [Tue, 16 Nov 2010 18:22:10 +0000 (19:22 +0100)]
tests: avoid '##'-style comments inside recipe commands.
* tests/confh.test, tests/confh8.test: Remove
double-hash comments from makefile rule commands, they
are not part of the Automake API.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 16 Nov 2010 18:18:56 +0000 (19:18 +0100)]
Fix regression in ansi.test (failure on AIX 5.3).
* tests/ansi.test: Remove redundant hackish check done using a
hand-postprocessed Makefile.in. This checs worked by setting
the `$(SHELL)' macro on the command line of make, but this is
not supported by the AIX 5.3 make implementation.
This bug has been lurking for a long time, and was activated by
commit v1.11-125-gc1f6cdb "Enable `errexit' shell flag in various
tests". Report by Ralf Wildenhues.
Ralf Wildenhues [Sun, 14 Nov 2010 17:22:50 +0000 (18:22 +0100)]
tests: work around dash quoting issue in case statements.
* tests/color.test, tests/color2.test: Quote variable in case
pattern, to avoid skipping tests with dash 0.5.5.1.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 14 Nov 2010 16:57:56 +0000 (17:57 +0100)]
Rebuild menus in the manual.
* doc/automake.texi: Rebuild menus (using ^C ^U ^A in emacs).
Thanks to Ian Lance Taylor for the suggestion.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 14 Nov 2010 16:53:49 +0000 (17:53 +0100)]
Fix install-strip when $(STRIP) contains several words.
* lib/am/install.am (install-strip): Update comment. Use
separate sub-make invocations for empty and nonempty $(STRIP),
to fix quoting issues.
* tests/strip2.test, tests/strip3.test: New tests.
* tests/Makefile.am (TESTS): Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Wed, 10 Nov 2010 18:20:01 +0000 (19:20 +0100)]
Merge branch 'fix-yaccdry.test' into maint
* fix-yaccdry.test:
Fix yaccdry.test failure: require bison.
Ralf Wildenhues [Wed, 10 Nov 2010 18:19:36 +0000 (19:19 +0100)]
Fix yaccdry.test failure: require bison.
* tests/yaccdry.test: Require bison.
Found by NixOS Hydra.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 7 Nov 2010 14:06:34 +0000 (15:06 +0100)]
Merge branch 'pluseq-fix' into maint
Stefano Lattarini [Sat, 6 Nov 2010 11:46:52 +0000 (12:46 +0100)]
Fix a bug in variable concatanation with `+='.
* lib/Automake/VarDef.pm (append): Remove extra backslash-escaped
newlines from the end of the variable's content, before appending
to it.
* tests/pluseq11.test: New test, exposing the bug.
* tests/Makefile.am (TESTS): Update.
Reported by Andy Wingo.
Stefano Lattarini [Sat, 6 Nov 2010 17:26:53 +0000 (18:26 +0100)]
Fix bug in rules for creating vala vapi/header files.
* automake.in (lang_vala_finish_target): Add forgotten "fi" in an
if control structure in a generated make rules. Bug introduced
by previous commit `v1.11-221-gd7c1679', and revealed by failure
of test `vala2.test'.
Ralf Wildenhues [Sun, 3 Oct 2010 10:29:40 +0000 (12:29 +0200)]
Fix and document rules to not touch the tree with `make -n'.
* doc/automake.texi (Multiple Outputs): Document the problem of
modifications during dry-run execution, propose solution.
* NEWS: Update.
* automake.in (lang_vala_finish_target): Split recipe so the
stamp file is not removed with GNU `make -n'.
(lang_yacc_target_hook): Separate removal of parser output file
and header remaking.
* lib/am/lisp.am ($(am__ELCFILES)): Determine whether -n was
passed to make, take care not to remove any files in that case.
* lib/am/remake-hdr.am (%CONFIG_H%): Separate removal of
%STAMP% file from induced remaking of config header.
* tests/autohdrdry.test, tests/lispdry.test, tests/yaccdry.test:
New tests.
* tests/Makefile.am (TESTS): Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Thu, 14 Oct 2010 04:14:20 +0000 (06:14 +0200)]
Add FAQ entry for bug reporting instructions.
* doc/automake.texi (Reporting Bugs): New section.
(Introduction): Refer to it.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Mon, 4 Oct 2010 16:50:53 +0000 (18:50 +0200)]
Add support for newer python versions.
* m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
_AM_PYTHON_INTERPRETER_LIST. Since we are at it, break a long
line and fix indentation.
* THANKS: Updated.
From a report by Thomas Klausner.
Stefano Lattarini [Tue, 21 Sep 2010 10:54:25 +0000 (12:54 +0200)]
Add test for `AM_WITH_DMALLOC' macro.
* tests/dmalloc.test: New test.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Mon, 4 Oct 2010 16:17:22 +0000 (18:17 +0200)]
Fix nits and bugs in tests `help*.test'.
* tests/help4.test: Fix broken sed commands used to strip `-W...'
flags away from "$AUTOMAKE" and "$ACLOCAL".
* tests/help3.test: Likewise, and fix a botched comment.
* tests/help.test: Likewise. Also, use "AUTOMAKE_fails ..."
instead of "$AUTOMAKE ... && Exit 1", for consistency and to
please maintainet-check.
* tests/help2.test: Likewise.
Stefano Lattarini [Sat, 2 Oct 2010 17:33:44 +0000 (19:33 +0200)]
Improve tests `help*.test' (also fixes maintcheck failures).
* tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
flags stripped away rather than hard-coded `automake-$APIVERSION',
to better honour user-overrides. Similarly for aclocal.
* tests/help2.test: Likewise.
* tests/help3.test: Likewise.
* tests/help4.test: Likewise.
From a suggestion by Ralf Wildenhues.
Ralf Wildenhues [Sun, 3 Oct 2010 09:42:12 +0000 (11:42 +0200)]
Document and fix expansion of variables before rules.
* doc/automake.texi (General Operation): Document that variables
are expanded before rules.
* lib/am/check.am (am__check_post): Reword a bit so it does not
get matched as a rule.
Suggestion by Ben Pfaff.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 2 Oct 2010 18:04:34 +0000 (20:04 +0200)]
Regenerate tree with Autoconf 2.68.
Ralf Wildenhues [Sat, 2 Oct 2010 16:38:34 +0000 (18:38 +0200)]
Merge branch 'fix-tests-empty-regression' into maint
* fix-tests-empty-regression:
Revert "parallel-tests: avoid command-line length limit issue."
Ralf Wildenhues [Sun, 26 Sep 2010 07:21:14 +0000 (09:21 +0200)]
Revert "parallel-tests: avoid command-line length limit issue."
This reverts commit
24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835,
because it re-opened the bug fixed by v1.11-10-g218e678.
2010-09-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parallel-tests: avoid command-line length limit issue.
* automake.in (handle_tests): New argument $makefile, new
substitution %MAKEFILE%.
(generate_makefile): Adjust.
* lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
sanitized TEST_LOGS value as makefile snippet on standard
input to $(MAKE), to avoid exceeding the command line limit on
w32 (MSYS).
* NEWS: Update.
Report by Bob Friesenhahn.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 25 Sep 2010 15:07:27 +0000 (17:07 +0200)]
Extend tests on `--help' and `--version' options.
* tests/help.test: Create a new empty directory and chdir into
it, rather than removing already present files. Run the aclocal
and automake wrapper scripts directly, instead of relying on
$AUTOMAKE and $ACLOCAL. Be sure to correctly match literal dots
in aclocal's and automake's stderr. Add a trailing `:' command.
* tests/help2.test: New test, checking that options `--help' and
`--version' works in directories with broken `configure.in'.
* tests/help3.test: New test, checking that options `--help' and
`--version' take precedence on the other options.
* tests/help4.test: New test, checking that the first among the
`--help' and `--version' options to be specified on the command
line wins.
* tests/Makefile.am (TESTS): Updated.
Stefano Lattarini [Sat, 25 Sep 2010 19:31:06 +0000 (21:31 +0200)]
Testsuite: Use `$PATH_SEPARATOR', not `:', when extending PATH.
* tests/compile2.test: Do no uselessly (implicitly) repeat the
computation of PATH_SEPARATOR again.
* tests/instmany-mans.test: Use `$PATH_SEPARATOR', not `:', when
extending/redefining PATH.
* tests/instmany-python.test: Likewise.
* tests/instmany.test: Likewise.
* tests/man4.test: Likewise.
* tests/mkinst3.test: Likewise.
* tests/mmodely.test: Likewise.
* tests/multlib.test: Likewise.
* tests/txinfo30.test: Likewise.
* tests/README (Section "Writing test cases" subsection "Do"):
Updated.
* Makefile.am (sc_tests_PATH_SEPARATOR): New maintainer check.
(syntax_check_rules): Updated.
Stefano Lattarini [Sat, 25 Sep 2010 14:53:13 +0000 (16:53 +0200)]
Testsuite: new vars `$PATH_SEPARATOR' and `$APIVERSION'.
* tests/defs.in ($APIVERSION): New AC_SUBST'd variable.
($ACLOCAL, $AUTOMAKE): Use it.
($PATH_SEPARATOR): New AC_SUBST'd variables.
($PATH): Use it.
Stefano Lattarini [Wed, 22 Sep 2010 20:31:22 +0000 (22:31 +0200)]
Manual: be more agnostic w.r.t. version control system used.
* doc/automake.texi (Basics of Distribution): Also refer to `.svn'
directories as a type of probably-unwanted files that are copied
regardless when adding directories to EXTRA_DIST.
(The dist Hook): Show a dist-hook example which removes Subversion
`.svn' private directories from distdir, rather than CVS private
directories.
(missing and AM_MAINTAINER_MODE): Try to be more agnostic w.r.t.
the version control system used.
Stefano Lattarini [Wed, 22 Sep 2010 20:04:55 +0000 (22:04 +0200)]
Manual: index refer to target "git-dist", not "cvs-dist".
* doc/automake.texi (General Operation): Index the non-standard
example about "git-dist" under the "git-dist" label, not under
the "cvs-dist" one.
Stefano Lattarini [Wed, 22 Sep 2010 19:35:58 +0000 (21:35 +0200)]
Perl modules: remove references to "Automake CVS repository".
* lib/Automake/Channels.pm: Update comments to refer to "Automke's
git repository" rather than to "Automake's CVS repository".
* lib/Automake/Configure_ac.pm: Likewise.
* lib/Automake/FileUtils.pm: Likewise.
* lib/Automake/Struct.pm: Likewise.
* lib/Automake/XFile.pm: Likewise.
* lib/Automake/Version.pm (=head1 DESCRIPTION): Refer to "git
branches" rather than "CVS branches".
Stefano Lattarini [Wed, 22 Sep 2010 19:26:09 +0000 (21:26 +0200)]
Remove obsolete .cvsignore files.
* .cvsignore, doc/.cvsignore, lib/.cvsignore, lib/am/.cvsignore,
lib/Automake/.cvsignore, lib/Automake/tests/.cvsignore,
m4/.cvsignore, tests/.cvsignore: Files deleted. Even when using
savannah's CVS readonly mirror there's no way to commit back to
the real repository, so this files are not worth maintaining or
keeping around.
Stefano Lattarini [Tue, 21 Sep 2010 09:09:33 +0000 (11:09 +0200)]
m4/dmalloc.m4: Bump serial number and copyright years.
Stefano Lattarini [Mon, 20 Sep 2010 21:31:29 +0000 (23:31 +0200)]
Fix broken link in `AM_WITH_DMALLOC' help screen.
* m4/dmalloc.m4 (AM_WITH_DMALLOC): Refer only to the dmalloc site
`http://www.dmalloc.com', not to the dmalloc tarball there (which
seems to have been removed, substituted by multiple release
tarballs now).
Eric Blake [Fri, 17 Sep 2010 12:31:33 +0000 (06:31 -0600)]
Avoid triple-space after period.
* automake.in (handle_single_transform): Avoid 3 spaces at
sentence end.
* ChangeLog.03: Likewise.
* lib/Automake/ChannelDefs.pm: Likewise.
* lib/Automake/Channels.pm (_print_message): Likewise.
* lib/Automake/Rule.pm (rule): Likewise.
* lib/Automake/Variable.pm (var): Likewise.
* lib/am/distdir.am: Likewise.
* tests/insthook.test: Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
Stefano Lattarini [Wed, 15 Sep 2010 19:43:56 +0000 (21:43 +0200)]
Test automake-generated portions of configure help screen.
* tests/help-depend.test: New test.
* tests/help-depend2.test: Likewise.
* tests/help-dmalloc.test: Likewise.
* tests/help-init.test: Likewise.
* tests/help-lispdir.test: Likewise.
* tests/help-maintainer.test: Likewise.
* tests/help-multilib.test: Likewise.
* tests/help-regex.test: Likewise.
* tests/help-silent.test: Likewise.
* tests/help-upc.test: Likewise.
* tests/mmode.test: Remove tests on `configure --help' output,
they are supersed by tests in `help-maintainer.test'.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Tue, 14 Sep 2010 20:50:15 +0000 (22:50 +0200)]
Fixlets for HACKING.
* HACKING (Administrivia): Fixed typo `NES' for `NEWS'.
(Naming): Do not refer to a convention dating back to Feb 2001
as "very new". Related rewording.
(Working with Git): Now we require autoconf 2.67 for bootstrap,
so use that version in the examples.
Stefano Lattarini [Tue, 14 Sep 2010 20:16:35 +0000 (22:16 +0200)]
tests/README: Don't put GCS mandated tools in $required.
Ralf Wildenhues [Mon, 13 Sep 2010 20:09:41 +0000 (22:09 +0200)]
* HACKING: Hint at old commits with `git describe' output.
Stefano Lattarini [Mon, 13 Sep 2010 12:51:25 +0000 (14:51 +0200)]
Merge branch 'fix-colon-tests-regression' into maint
Stefano Lattarini [Mon, 13 Sep 2010 12:50:14 +0000 (14:50 +0200)]
Fix regression in test `colon4.test'.
* tests/colon4.test: Fix botched editing to `configure.in'
that made the test useless. Since we are at it, improve
comments and make grepping of generated Makefile.in slighty
stricter.
Regression introduced by change "Modernize, improve and/or
extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
Stefano Lattarini [Sun, 4 Jul 2010 23:23:16 +0000 (01:23 +0200)]
Do not require "gzip" explicitly in tests.
The gzip utility is simply expected to be present on any decent
target system for Automake. So it's pointless to put it in
$required.
* tests/install2.test ($required): Do not require "gzip".
* tests/lex3.test: Likewise.
* tests/pr9.test: Likewise.
From a suggestion by Ralf Wildenhues.
Stefano Lattarini [Wed, 8 Sep 2010 23:24:52 +0000 (01:24 +0200)]
regenerate Makefile.in to sync with previous commits
Stefano Lattarini [Wed, 8 Sep 2010 19:05:36 +0000 (21:05 +0200)]
Make some `confh*.test' tests more "semantic" (plus tweakings).
* tests/confh.test: Run "autoconf", "configure" and "make check",
instead of munging/grepping the generated `Makefile.in'.
* tests/confh4.test: Relax the grepping of Makefile.in w.r.t.
white spaces. Do not create usless dummy source file `foo.c'
and useless dummy header file `acconfig.h'.
(configure.in): Remove superfluous call to `AC_OUTPUT'.
* tests/confh6.test: Add trailing `:' command.
* tests/confh7.test: In comments, add reference to ...
* tests/confh8.test: ... this new test, "semantic" sister
of `confh7.test'.
* tests/Makefile.am (TESTS): Updated.
Prompted by a report from Ralf Wildenhues.
Stefano Lattarini [Wed, 8 Sep 2010 10:28:31 +0000 (12:28 +0200)]
Remove useless whitespace padding in XFAIL_TESTS definition.
* tests/Makefile.am (XFAIL_TESTS): Remove whitespace padding.
Ralf Wildenhues [Tue, 7 Sep 2010 02:38:08 +0000 (04:38 +0200)]
parallel-tests: avoid command-line length limit issue.
* automake.in (handle_tests): New argument $makefile, new
substitution %MAKEFILE%.
(generate_makefile): Adjust.
* lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
sanitized TEST_LOGS value as makefile snippet on standard
input to $(MAKE), to avoid exceeding the command line limit on
w32 (MSYS).
* NEWS: Update.
Report by Bob Friesenhahn.
Ralf Wildenhues [Tue, 7 Sep 2010 02:35:49 +0000 (04:35 +0200)]
Posix 2008 requires make to set errexit.
* lib/am/check.am: Update comment.
Stefano Lattarini [Fri, 27 Aug 2010 16:25:17 +0000 (18:25 +0200)]
Fix bug in test missing6.test.
* tests/missing6.test: Fix the hack used to edit `configure.in',
to avoid producing a configure script that breaks with shells
that do not support $LINENO. Also throw in a couple of cosmetic
changes.
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: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.