Ralf Wildenhues [Sat, 15 Jan 2011 08:03:34 +0000 (09:03 +0100)]
Merge branch 'sanity-sleep-fix-master'
* sanity-sleep-fix-master:
Avoid configure warnings from wait about reused PIDs.
Ralf Wildenhues [Sat, 15 Jan 2011 08:02:57 +0000 (09:02 +0100)]
Avoid configure warnings from wait about reused PIDs.
* m4/sanity.m4 (AM_SANITY_CHECK): Hide wait stderr output.
Fixes spurious failure of depcomp2.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Thu, 13 Jan 2011 19:23:36 +0000 (20:23 +0100)]
Merge branch 'maint'
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:40 +0000 (23:44 +0100)]
Merge branch 'maint'
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 22:36:16 +0000 (23:36 +0100)]
Merge branch 'yacc-work'
Stefano Lattarini [Wed, 12 Jan 2011 22:36:00 +0000 (23:36 +0100)]
Merge branch 'doc-yacc-d-improve' into yacc-work
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 23:06:00 +0000 (00:06 +0100)]
Merge branch 'maint'
Stefano Lattarini [Tue, 11 Jan 2011 23:02:50 +0000 (00:02 +0100)]
Merge branch 'yacc-work'
Stefano Lattarini [Tue, 11 Jan 2011 19:03:05 +0000 (20:03 +0100)]
tests: do not force yacc-requiring tests to use bison
* tests/defs.in: New required entry 'yacc'. Remove old
required entry 'bison'.
* tests/cond35.test ($required): Require yacc, not bison.
* tests/cond36.test: Likewise.
* tests/pr204.test: Likewise.
* tests/silent-many-gcc.test: Likewise.
* tests/silent-many-generic.test: Likewise.
* tests/silent-yacc-gcc.test: Likewise.
* tests/silent-yacc-generic.test: Likewise.
* tests/subpkg.test: Likewise.
* tests/suffix10.test: Likewise.
* tests/yacc-basic.test: Likewise.
* tests/yacc-clean.test: Likewise.
* tests/yacc-d-basic.test: Likewise.
* tests/yacc-d-vpath.test: Likewise.
* tests/yacc-dist-nobuild.test: Likewise.
* tests/yacc-nodist.test: Likewise.
* tests/yacc4.test: Likewise.
* tests/yacc6.test: Likewise.
* tests/yacc7.test: Likewise.
* tests/yacc8.test: Likewise.
* tests/yaccdry.test: Likewise.
* tests/yaccvpath.test: Likewise.
Stefano Lattarini [Tue, 11 Jan 2011 02:17:10 +0000 (03:17 +0100)]
tests: more consistent checks about invalid options
* tests/aclocal.test: Grepping of automake stderr for messages
reporting invalid options made stricter.
* tests/no-outdir-option.test: Likewise. Also, create a dummy
`Makefile.am', to ensure that the automake failures are really
caused only by unrecognized options.
* tests/automake.test: Added trailing `:' command. Removed
redundant checks on `--help' and `--version' option (already
performed in the test `help*.test').
Stefano Lattarini [Sat, 8 Jan 2011 18:40:04 +0000 (19:40 +0100)]
tests: enable 'errexit' shell flag by default.
* tests/defs: Enable `errexit' shell flag (near the end).
Removed redundant comment about the enabling of shell traces.
* tests/README (Writing test cases): Update, and use nicer
formatting in a couple of places.
* All tests: Adjusted by removing now-redundant calls to
'set -e'.
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:24:06 +0000 (13:24 +0100)]
Merge branch 'maint'
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:35:38 +0000 (02:35 +0100)]
Merge branch 'maint'
Conflicts:
ChangeLog
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 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 01:20:19 +0000 (02:20 +0100)]
tests: texinfo unrecognized extensions
* tests/txinfo-unrecognized-extension.test: New test.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Tue, 11 Jan 2011 01:07:51 +0000 (02:07 +0100)]
Merge branch 'maint'
Conflicts:
tests/instdir-texi.test
tests/txinfo22.test
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.
Stefano Lattarini [Tue, 11 Jan 2011 00:10:44 +0000 (01:10 +0100)]
tests: fix spurious failure in 'tests/yflags-conditional.test'
* tests/yflags-conditional.test: Filter out message "warnings are
treated as errors" from automake stderr, to avoid a false positive
when grepping for extraneous warning messages.
Stefano Lattarini [Tue, 11 Jan 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch 'yacc-work'
Stefano Lattarini [Mon, 10 Jan 2011 14:50:35 +0000 (15:50 +0100)]
yacc: warn about conditional content in *YFLAGS variables
This commit fixes automake bug#7804.
* automake.in (lang_yacc_target_hook): Warn if any of the relevant
*YFLAGS variables has conditional contents (not only a conditional
definition). Related refactoring.
* NEWS: Updated.
* tests/yflags-conditional.test: Updated and extended.
* tests/yflags-conditional-force.test: New test.
* 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 15:20:34 +0000 (16:20 +0100)]
Merge branch 'yacc-work'
Stefano Lattarini [Fri, 7 Jan 2011 20:52:56 +0000 (21:52 +0100)]
yacc: support variable expansions in *YFLAGS definition.
This change fixes automake bug#7800.
* automake.in (lang_yacc_target_hook): Use 'value_as_list_recursive'
instead of 'variable_value' to get the value of *YFLAGS variables.
Related changes.
($DASH_D_PATTERN): Removed.
* tests/Makefile.am (XFAIL_TESTS): Remove yflags-var-expand.test.
* tests/yacc-clean.test: Remove workaround for now-fixed bug.
* NEWS: Update.
Stefano Lattarini [Fri, 7 Jan 2011 19:52:17 +0000 (20:52 +0100)]
yacc: more tests on *YFLAGS support
* tests/yflags-var-expand.test: New test, still xfailing. It
exposes automake bug#7800 -- "automake fails to honor `-d' in
AM_YFLAGS when variable expansions are involved".
* tests/yflags-d-false-positive.test: New test, checking that
automake do not spuriously see `-d' in *YFLAGS when that isn't
really there.
* tests/yflags-force-override.test: New test, checking that
automake can cope with definition of the YFLAGS variable in
Makefile.am (even if that is an extremely bad practice, as that
variable is user-reserved).
* tests/yflags-cmdline-override.test: New test, checking that
automake can cope with user-redefinition of YFLAGS at configure
time and/or at make time.
* tests/yflags-conditional.test: New test, checks that automake
warns on conditionally-defined *YFLAGS variables.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
Stefano Lattarini [Wed, 5 Jan 2011 15:07:56 +0000 (16:07 +0100)]
yacc: extend and improve tests
* tests/yacc-basic.test: Also check that the intermediate C file
is mentioned in the generated Makefile.in, and that it is created
by the first make invocation.
* tests/yacc3.test: Test removed, superseded by ...
* tests/yacc-d-basic.test: ... this new test.
* tests/yacc2.test: Add reference to that new test in the heading
comments.
* tests/yacc-d-vpath.test: New test.
* tests/yaccvpath.test: Updated heading comments. Do not require
gcc anymore, as any working C compiler should be enough. Remove
redundant comments.
* tests/yacc-nodist.test: New test.
* tests/yacc-dist-nobuild.test: New test.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Sun, 9 Jan 2011 14:37:46 +0000 (15:37 +0100)]
cosmetics: remove trailing whitespaces
* tests/libobj17.test: Remove trailing whitespace.
* ChangeLog: Update.
Stefano Lattarini [Sun, 9 Jan 2011 14:30:42 +0000 (15:30 +0100)]
Merge branch 'maint'
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>
Stefano Lattarini [Sat, 8 Jan 2011 12:33:41 +0000 (13:33 +0100)]
Merge commit 'tests-lexyacc-extend' into yacc-works
Extend, fix and improve tests on Lex and Yacc support.
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 [Fri, 7 Jan 2011 21:01:20 +0000 (22:01 +0100)]
Merge branch 'yacc-clean'
Stefano Lattarini [Fri, 7 Jan 2011 14:44:47 +0000 (15:44 +0100)]
yacc: "make clean" removes .c and .h files from non-distributed .y
Previously, while automake did *not* distribute C source and header
files derived from non-distributed Yacc sources, it still caused
them to be removed only by "make maintainer-clean" only, and not by
simply "make clean" or "make distclean".
This caused "make distcheck" to fail, unless the developer put
those generated .c and .h files in CLEANFILES or in DISTCLEANFILES
by hand.
This change fixes this issue, by making non-distributed `.c' and
`.h' files generated by non-distributed Yacc sources cleaned by
"make clean".
* tests/automake.in (lang_yacc_target_hook): Make C source and
header files derived from non-distributed Yacc files cleaned by
"make clean", not only by "make maintainer-clean".
* tests/yacc-clean.test: New test.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
Stefano Lattarini [Sun, 2 Jan 2011 14:49:16 +0000 (15:49 +0100)]
Tests: normalize use of the 'errexit' shell flag.
* tests/maken3.test (check_targets): Remove redundant call to
'set -e'.
* tests/maken4.test: Likewise.
* tests/ansi5.test: Call 'set -e' just after './defs' has been
sourced.
* tests/ansi6.test: Likewise.
* tests/ansi7.test: Likewise.
* tests/cond16.test: Likewise.
* tests/cond17.test: Likewise.
* tests/cond18.test: Likewise.
* tests/cond19.test: Likewise.
* tests/cond20.test: Likewise.
* tests/cond21.test: Likewise.
* tests/instdat2.test: Likewise.
* tests/instdir-texi.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/remake1a.test: Likewise.
* tests/ccnoco.test: Likewise, and add trailing `:' command.
* tests/comment4.test: Likewise.
* tests/gcj4.test: Likewise.
* tests/nodist2.test: Likewise.
* tests/nodist3.test: Enable 'errexit' shell flag (this should
have been done in commit v1.11-248-g317e17b, but the relevant
hunk has been forgotten somehow).
* tests/output.test: Likewise.
* tests/gnits2.test: Likewise, and display captured stderr to
script's stderr, not to script's stdout.
* tests/gnits3.test: Likewise. Also, prefer 'cat' over 'echo'
to append to Makefile.am, and really check that the exit status
of "make installcheck" indicates failure.
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:12:13 +0000 (06:12 +0100)]
Merge branch 'maint'
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:47:11 +0000 (05:47 +0100)]
Avoid caching bug in cygnus mode test.
* tests/cygnus-requires-maintainer-mode.test: Remove
autom4te.cache directory before rerunning aclocal, to
remove trace caches.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 2 Jan 2011 04:38:18 +0000 (05:38 +0100)]
Merge branch 'maint'
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 [Thu, 23 Dec 2010 21:57:34 +0000 (22:57 +0100)]
* NEWS: Add missing blank line between two entries.
Stefano Lattarini [Thu, 23 Dec 2010 20:41:45 +0000 (21:41 +0100)]
Merge branch 'tests-suffix-extend'
Conflicts:
tests/suffix10.test
Stefano Lattarini [Fri, 15 Oct 2010 15:37:38 +0000 (17:37 +0200)]
Improve and extend tests `suffix*.test'.
* tests/suffix.test: Check that suffix rules for C compilation are
only included once. Try also with a static library.
* tests/suffix2.test: Add a new grep to help potential debugging.
Do not run automake with the `--add-missing' options, since we
already create all the needed auxiliary files. Try also *without*
the `no-dependencies' automake option.
* tests/suffix4.test: Make grepping of Makefile.in stricter.
* tests/suffix3.test: Rewritten to run also autoconf, ./configure
and make.
* tests/suffix5.test: Likewise.
* tests/suffix6.test: Fix botched recipe indentation (eight spaces
were used instead of a tabulation character). Extend to check
that `.obj' is handled like `.$(OBJEXT)' (as is done for `.o').
Improved parsing & grepping of generated Makefile.in. Other minor
fixes and improvements.
* tests/suffix10.test: Move some checks in Makefile.am. Also run
"make all".
* tests/suffix12.test: Likewise, and account for VPATH issues in
weaker make implementations.
* tests/suffix11.test: Likewise. Also, run "make distcheck", for
completeness, and related changes.
* tests/suffix8.test: Likewise. Also, do not put `gcc' anymore
in $required.
* tests/suffix13.test: Do not use the `--force-missing' automake
option unnecessarily.
* tests/suffix6b.test: New test, semantic sister of `suffix6.test'.
* tests/suffix6c.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
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, 21 Dec 2010 21:59:19 +0000 (22:59 +0100)]
Add some tests on 'cygnus' mode.
* tests/clean2.test: Extend.
* tests/cygnus-check-without-all.test: New test.
* tests/cygnus-dependency-tracking.test: Likewise.
* tests/cygnus-distclean.test: Likewise.
* tests/cygnus-imply-foreign.test: Likewise.
* tests/cygnus-no-dist.test: Likewise.
* tests/cygnus-no-installinfo.test: Likewise.
* tests/cygnus-requires-maintainer-mode.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Wed, 22 Dec 2010 20:01:07 +0000 (21:01 +0100)]
Merge branch 'tests-init'
Stefano Lattarini [Sat, 30 Jan 2010 13:01:39 +0000 (14:01 +0100)]
Fix parallel testsuite run with Zsh.
This change deals with a Zsh incompatibility in the handling
of the special shell variable `$0' in sourced files; this
incompatibility used to cause utter breakage when the
Automake testsuite was run in parallel mode with Zsh as
the $(TEST_LOG_COMPILER).
For more information, please refer to the thread "Fix parallel
testsuite run with zsh" on automake-patches, dated 2010-12-22:
<http://lists.gnu.org/archive/html/automake-patches/2010-12/msg00135.html>
This change works around the problems described above for Zsh 4.3
or later, and offers better error messages (instead of random
failures) for earlier Zsh version.
* tests/README (Supported shells): When describing the manual
workaround about the Zsh incompatibility in the handling of `$0',
tell that it is now needed only with Zsh versions preceding 4.3.
Done also some minor rewordings.
* tests/defs-static.in ($argv0): New variable, offers a workaround
for the Zsh incompatibility in the handling of `$0'.
Abort if that variable cannot be correctly set (can happen only
in older Zsh version).
* tests/defs ($me): Define using `$argv0', not `$0'.
Stefano Lattarini [Wed, 22 Dec 2010 09:36:18 +0000 (10:36 +0100)]
Tests defs: keep track of original $AUTOMAKE and $ACLOCAL values.
This is especially useful for tests which might want to run
automake and aclocal without additional flags and warnings.
* tests/defs-static.in ($original_ACLOCAL): New variable.
($original_AUTOMAKE): Likewise.
* tests/help.test: Use them.
* tests/help2.test: Likewise.
* tests/help3.test: Likewise.
* tests/help4.test: Likewise.
From a suggestion by Ralf Wildenhues.
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:44:14 +0000 (15:44 +0100)]
Merge branch 'maint'
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:41:20 +0000 (02:41 +0100)]
Minor improvements to test 'amopts.test'.
* tests/amopts.test: Remove botched comment. Make grepping of
automake stderr slighty stricter. Add trailing `:' command.
Stefano Lattarini [Tue, 21 Dec 2010 01:34:34 +0000 (02:34 +0100)]
Merge branch 'backcompat-tests'
Stefano Lattarini [Tue, 21 Dec 2010 01:33:43 +0000 (02:33 +0100)]
backcompat6.test: avoid comments inside recipe commands.
* tests/backcompat6.test: Remove shell comments from makefile rule
commands, as they are not portable to (at least) Tru64 make.
Stefano Lattarini [Tue, 21 Dec 2010 01:22:22 +0000 (02:22 +0100)]
Merge branch 'tests-man-fixes'
Stefano Lattarini [Tue, 21 Dec 2010 01:15:08 +0000 (02:15 +0100)]
man8.test: avoid comments inside recipe commands.
* tests/man8.test: Remove shell comments from makefile rule
commands, as they are not portable to (at least) Tru64 make.
Stefano Lattarini [Tue, 21 Dec 2010 01:02:56 +0000 (02:02 +0100)]
Merge branch 'maint'
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 [Tue, 21 Dec 2010 00:32:15 +0000 (01:32 +0100)]
Merge branch 'auxdir-tests'
Stefano Lattarini [Tue, 21 Dec 2010 00:31:50 +0000 (01:31 +0100)]
Fix spurious failures in tests on AC_CONFIG_AUX_DIR.
* tests/auxdir7.test: Do not try to needlessly overwrite the files
`install-sh' and `missing'. This avoid spurious failures in "make
distcheck", when those files might be copied as read-only from the
`lib' directory.
* tests/auxdir8.test: Likewise.
Stefano Lattarini [Sat, 18 Dec 2010 12:43:28 +0000 (13:43 +0100)]
Merge branch 'tests-posixsubst-specialvars'
Stefano Lattarini [Sat, 18 Dec 2010 12:34:23 +0000 (13:34 +0100)]
Make test 'posixsubst-script' portable to MinGW/MSYS.
* tests/posixsubst-script.test: Ensure that the generated dummy
scripts really start with a shebang line, to work around a
limitation of 'test -x' on MinGW/MSYS.
Reported by Ralf Wildenhues.
Stefano Lattarini [Sat, 18 Dec 2010 11:58:04 +0000 (12:58 +0100)]
Improve comments in tests `posixsubst*.test'.
* tests/posixsubst-data.test: Improve comment explaining why we
try also empty match suffix.
* tests/posixsubst-extradist.test: Likewise.
* tests/posixsubst-ldadd.test: Likewise.
* tests/posixsubst-libraries.test: Likewise.
* tests/posixsubst-ltlibraries.test: Likewise.
* tests/posixsubst-programs.test: Likewise.
* tests/posixsubst-scripts.test: Likewise.
* tests/posixsubst-sources.test: Likewise.
* tests/posixsubst-tests.test: Likewise.
Suggested by Ralf Wildenhues.
Stefano Lattarini [Sat, 18 Dec 2010 11:22:49 +0000 (12:22 +0100)]
Merge branch 'maint'
Stefano Lattarini [Sat, 18 Dec 2010 11:22:46 +0000 (12:22 +0100)]
Merge branch 'tests-init'
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 [Sat, 18 Dec 2010 10:54:15 +0000 (11:54 +0100)]
Merge branch 'tests-lexyacc-extend'
Stefano Lattarini [Fri, 7 May 2010 13:07:37 +0000 (15:07 +0200)]
Extend, fix and improve tests on Lex and Yacc support.
* tests/lexcpp.test: New test script, on support for Lex + C++.
* tests/lexvpath.test: New test script, test build and rebuild
rules for lexers in VPATH setup.
* tests/yacc-basic.test: New test script, run simple "semantic"
checks on basic Yacc support (similarly to what lex3.test does
for Lex support).
* tests/lex.test: Don't create useless dummy source file joe.l.
Remove extra blank lines.
* tests/lex4.test: Add trailing `:' command. Do not create dummy
useless lex source file.
* tests/lex2.test: Likewise. Call automake with the `-a' option,
so that it doesn't fail for the absence of `ylwrap' script. Make
grepping of automake stderr stricter.
* tests/yacc7.test: Add trailing `:' command. Enable `errexit'
shell flag earlier (just after having sourced ./defs).
* tests/yacc4.test: Likewise. Also ...
(configure.in): Use pre-populated skeleton set up by ./defs,
instead of writing one from scratch.
Other minor cosmetic changes.
* tests/yacc5.test: Likewise.
* tests/yaccvpath.test: Likewise. Also ...
($distdir): New variable.
Use it throughout.
* tests/lex5.test: Likewise.
* tests/lex3.test: Likewise. Check the distdir, rather than
grepping the distribution tarball. Extend the test on the
created binary, and be sure to avoid hangs. Add some comments.
* tests/yacc.test: Use stricter grepping. Add trailing `:'.
* tests/yacc6.test: Likewise.
* tests/yacc3.test: Likewise. Do not create the unused file
`Makefile.sed'. Remove useless rules from Makefile.am. Other
minor cosmetic changes.
* tests/yacc2.test: Make grepping of generated `Makefile.in' and
of automake error messages stricter. Do not redirect output of
grep to /dev/null. Move call to aclocal earlier. Reduce the
number of empty blank lines. Fix a typo in comments.
* tests/yacc8.test: Fixed bugs that reduced the completeness of
the tests. Added trailing `:' command.
(configure.in): Use pre-populated skeleton set up by ./defs,
instead of writing one from scratch.
* tests/yaccpp.test: Test also extensions `.y++', `.ypp', and
`.yxx', rather than only `.yy'.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Thu, 16 Dec 2010 23:27:34 +0000 (00:27 +0100)]
Merge branch 'tests-canon-fixes'
Stefano Lattarini [Thu, 16 Dec 2010 23:26:38 +0000 (00:26 +0100)]
Minor cleanups in canon7.test.
* tests/canon7.test (_foo_bar_SOURCES): Remove libs.c.
(configure.in): Remove AC_PROG_CXX.
Ralf Wildenhues [Thu, 16 Dec 2010 18:58:56 +0000 (19:58 +0100)]
Merge branch 'tests-remake-extend'
* tests-remake-extend:
Avoid false positive in sc_tests_plain_make maintainer-check.
Ralf Wildenhues [Thu, 16 Dec 2010 18:58:21 +0000 (19:58 +0100)]
Avoid false positive in sc_tests_plain_make maintainer-check.
* Makefile.am (sc_tests_plain_make): Ensure to only match full
`make' words. Avoid false positive with remake11.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Thu, 16 Dec 2010 18:55:50 +0000 (19:55 +0100)]
Merge branch 'tests-canon-fixes'
* tests-canon-fixes:
Fix canon7.test failure.
Ralf Wildenhues [Thu, 16 Dec 2010 18:55:28 +0000 (19:55 +0100)]
Fix canon7.test failure.
* tests/canon7.test (_foo_bar_SOURCES): Add foobar.c.
(lib.h, libd.c, libs.c): Use const for constant strings.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Thu, 16 Dec 2010 18:53:43 +0000 (19:53 +0100)]
Merge branch 'tests-posixsubst-specialvars'
* tests-posixsubst-specialvars:
Fix typos in test comments.
Ralf Wildenhues [Thu, 16 Dec 2010 18:52:48 +0000 (19:52 +0100)]
Fix typos in test comments.
* tests/posixsubst-data.test, tests/posixsubst-extradist.test,
tests/posixsubst-ldadd.test, tests/posixsubst-libraries.test,
tests/posixsubst-ltlibraries.test, tests/posixsubst-programs.test,
tests/posixsubst-scripts.test, tests/posixsubst-sources.test,
tests/posixsubst-tests.test: Fix typos.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
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)]
More uses of AS_HELP_STRING in automake macros.
* m4/depend.m4 (AM_DEP_TRACK): Use `AS_HELP_STRING' to format
the help message added to the generated configure.
* m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
* m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
* m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
* m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
Also, bumped all serial numbers of the modified m4 files.
Stefano Lattarini [Thu, 16 Dec 2010 11:22:22 +0000 (12:22 +0100)]
Merge branch 'maint'
Stefano Lattarini [Thu, 16 Dec 2010 11:20:47 +0000 (12:20 +0100)]
Merge branch 'auxdir-tests'
Stefano Lattarini [Thu, 16 Dec 2010 11:16:01 +0000 (12:16 +0100)]
Merge branch 'tests-remake-extend'
Stefano Lattarini [Thu, 16 Dec 2010 11:07:18 +0000 (12:07 +0100)]
Merge branch 'tests-canon-fixes'
Stefano Lattarini [Fri, 13 Aug 2010 09:50:31 +0000 (11:50 +0200)]
Tests: extend checks on remake rules.
This adds proper semantical tests (i.e. run make to check the
rebuild rules are correctly triggered) in addition to tentative
grepping of the generated Makefile.in(s).
* tests/remake.test: Enable `errexit' shell flag, and related
changes. Modernize `configure.in'. Add trailing `:' command.
Improve heading comments, and add a reference to new sister test
remake1a.test.
* tests/remake3.test: Likewise (but with sister test being
remake3a.test).
* tests/remake2.test: Improve heading comments. Enable `errexit'
shell flag, and related changes. Modernize `configure.in'. Make
grepping of `Makefile.in' slightly stricter. Add trailing `:'
command.
* tests/remake5.test: Also run the `distcheck' target. Add
trailing `:' command. Use proper m4 quoting in configure.in.
* tests/remake4.test: Prefer `$me' over hard-coded test name.
* tests/remake7.test: Use the `configure.in' stub created by
./defs, rather than writing it from scratch.
* tests/remake6.test: Likewise. Also, add trailing `:' command,
and ensure verbose printing of captured make output.
* tests/remake1a.test: New test, sister of remake.test.
* tests/remake3a.test: New test, sister of remake3.test.
* tests/remake8a.test: New test.
* tests/remake8b.test: Likewise.
* tests/remake9a.test: Likewise.
* tests/remake9b.test: Likewise.
* tests/remake9c.test: Likewise.
* tests/remake9d.test: Likewise.
* tests/remake10a.test: Likewise.
* tests/remake10b.test: Likewise.
* tests/remake10c.test: Likewise.
* tests/remake11.test: Likewise.
* tests/remake12.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
Stefano Lattarini [Fri, 7 May 2010 22:32:22 +0000 (00:32 +0200)]
Extended tests on AC_CONFIG_AUX_DIR.
* tests/auxdir.test: Enable `errexit' shell flag. Prefer `$me'
over hard-coded test name. Use proper m4 quoting. Add trailing
`:' command.
* tests/auxdir2.test: Likewise. Try to call automake also with
the `-a' option, so that it will not fail for spurious reasons.
* tests/auxdir3.test: Add an explanatory comment and a trailing
`:' command.
* tests/auxdir4.test: Prefer `$me' over hard-coded test name.
Make grepping of automake stderr slightly stricter. Also, now
this test just checks about Automake's reaction to unportable
auxiliary directory names (and it has been extended in this
respect). Moved the checks about non-existent auxiliary
directories to ...
* tests/auxdir5.test: ... this new test.
* tests/auxdir6.test: New test.
* tests/auxdir7.test: Likewise.
* tests/auxdir8.test: Likewise.
* tests/auxdir9.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
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.
projects / platform / upstream / automake.git / log