Stefano Lattarini [Mon, 11 Apr 2011 15:06:05 +0000 (17:06 +0200)]
Merge branch 'fix-depcomp' into maint
Stefano Lattarini [Mon, 11 Apr 2011 10:26:58 +0000 (12:26 +0200)]
depcomp: fix bugs in tests and in the depcomp script
* lib/depcomp (gcc): Remove duplicated `-e' from sed invocation.
* tests/depcomp10.test: Make it executable. Fix a blunder that
has left part of an intended comment not prefixed by `#', thus
causing shell syntax errors. In this same comment, break a
too-long reported error message on multiple lines, for clarity.
Add reference to the relevant bug report. Add a comment which
explains why the test result 'skipped' if the first "make" call
fails. Add other useful comments.
* tests/depcomp9.test: Slightly improve comments.
Ralf Wildenhues [Mon, 11 Apr 2011 05:06:08 +0000 (07:06 +0200)]
Fix hp depmode for VPATH builds with GNU make.
* lib/depcomp: Be sure to remove VPATH-prefixed object from
dependency output when creating stub rule.
* tests/depcomp10.test: New test.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
Report by Bruno Haible.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 10 Apr 2011 11:38:47 +0000 (13:38 +0200)]
test defs: fix 'javac' requirement for older JDK versions
The Java compiler from JDK 1.5 (and presumably earlier versions)
cannot handle the `-version' option by itself; and while it does
print the version number, it then errors out with an usage error:
$ javac -version
javac 1.5.0_22
javac: no source files
Usage: javac <options> <source files>
...
Luckily, adding the `-help' option to the `javac' invocation
seems to fix this problem.
* tests/defs.in (javac): Pass also the `-help' option to the
`javac' program. Add a comment explaining why it is needed.
Report from Ralf Wildenhues.
Stefano Lattarini [Sun, 10 Apr 2011 07:01:37 +0000 (09:01 +0200)]
test defs: new requirement for the default java compiler
* tests/defs.in (for tool in $required): New requirement 'javac'.
* tests/java.test: Use it instead of ad-hoc configure check.
* tests/java-check.test: Likewise.
* tests/instfail-java.test: Likewise.
* tests/instdir-java.test: Likewise.
Stefano Lattarini [Wed, 6 Apr 2011 16:49:44 +0000 (18:49 +0200)]
java: check_JAVA does not cause compilation by "make all" anymore
Fixes automake bug#8234.
* automake.in (handle_java): Make stamp of class files built from
java sources in $(check_JAVA) a dependency of `check' target, not
`all' target.
* tests/java-check.test: New test.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
* THANKS: Update.
Report from Petteri Räty.
Ralf Wildenhues [Sat, 9 Apr 2011 10:38:11 +0000 (12:38 +0200)]
Clarify regex code in depcomp.
* lib/depcomp: Add comment why we don't need regex-escaping here.
Suggested by Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Wed, 6 Apr 2011 20:17:01 +0000 (22:17 +0200)]
Fix makedepend depmode for VPATH builds.
* lib/depcomp [makedepend]: Remove any VPATH prefix from the
object file name, so a rebuild doesn't attempt to update the
.Po files in the source tree.
* tests/depcomp9.test: New test.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Wed, 30 Mar 2011 16:06:29 +0000 (18:06 +0200)]
tests: fix timestamp-related failures
Fixes automake bug#8365.
* tests/aclocal6.test: Sleep before modifying m4 files that should
trigger remake rules. Remove incorrect/obsoleted comments.
* tests/subdir5.test: Likewise, and extend a bit.
* tests/subdir8.test: Likewise.
* tests/pr8365-remake-timing.test: New xfailing test.
* tests/Makefile.am (TESTS): Update.
Report from Sam Steingold.
Ralf Wildenhues [Sat, 2 Apr 2011 09:09:10 +0000 (11:09 +0200)]
Create subdirs for generated sources even when not dep tracking.
* automake.in (handle_single_transform): If $object is derived
and lands in subdir, be sure to output a dirstamp dependency.
* tests/yacc5.test: Avoid falsely matching the dirstamp
dependency when grepping for a rule.
* tests/lex-subobj-nodep.test: New test.
* tests/Makefile.am (TESTS): Update.
* THANKS: Update.
Report by Ignacy Gawedzki.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 2 Apr 2011 09:07:34 +0000 (11:07 +0200)]
Merge branch 'fix-check-exported-srcdir.test' into maint
* fix-check-exported-srcdir.test:
Fix locale issue in check-exported-srcdir.test.
Ralf Wildenhues [Sat, 2 Apr 2011 09:07:04 +0000 (11:07 +0200)]
Fix locale issue in check-exported-srcdir.test.
* tests/check-exported-srcdir.test: Reformulate glob to not fail
in a locale that ignores or interleaves character case.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 17 Mar 2011 10:13:29 +0000 (11:13 +0100)]
docs: better visibility for aclocal in the index
* doc/automake.texi (@menu): Rename title for entry 'configure'
from "Scanning configure.ac or configure.in" to the more precise
"Scanning configure.ac, using aclocal".
(@detailmenu): Adjust.
(@node configure): Adjust, and extend @cindex calls accordingly.
* THANKS: Update.
From a report by Maynard Johnson.
Stefano Lattarini [Wed, 30 Mar 2011 10:48:42 +0000 (12:48 +0200)]
tests: improve tests on "maintainer-clean" target
* tests/aclocal6.test: Move checks related to "maintainer-clean"
functionalities into ...
* tests/maintclean-vpath.test: ... this new test.
* tests/maintclean.test: Update heading comments. Extend to also
test subdirs. Remove useless disabling of YACC. Fix m4 quoting
in configure.in. Add a trailing `:' command.
* tests/Makefile.am (TESTS): Update.
Ralf Wildenhues [Mon, 21 Mar 2011 21:14:25 +0000 (22:14 +0100)]
Merge branch 'fix-unindent' into maint
* fix-unindent:
tests: fix unindent to use printf not echo for script.
Ralf Wildenhues [Mon, 21 Mar 2011 21:12:07 +0000 (22:12 +0100)]
tests: fix unindent to use printf not echo for script.
* tests/defs.in: Use printf rather than echo, as the latter may
interpret the backslashes in the sed script. Fixes test
failures with dash as /bin/sh.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Mon, 14 Mar 2011 11:44:53 +0000 (12:44 +0100)]
maintcheck: look for problematic names of testcases
The configure.in stub created by default by `tests/defs' obtains
the first argument of AC_INIT from the test name, and this can
cause some supported autoconf versions to fail with a spurious
error if that test name contains the name of an m4 or m4sugar
builtin or macro (e.g., `defn' or `m4_undefine').
See for example the bug fixed by commit v1.11-287-g1325a8a.
This change add a maintainer check that warns about test names
which are possibly problematic in this regard.
* Makefile.am (sc_test_names): New maintainer-check target.
(syntax_check_rules): Add it.
(m4_builtins): New helper variable.
(TESTS): Updated according to the following renamings.
* tests/include.test: Renamed ...
* tests/hdr-vars-defined-once.test: ... to this.
* tests/sinclude.test: Renamed ...
* tests/m4-inclusion.test: ... to this, and simplified
accordingly.
* tests/include2.test: Renamed ...
* tests/dist-included-parent-dir.test: ... to this, for
consistency.
Stefano Lattarini [Sat, 5 Mar 2011 00:57:36 +0000 (01:57 +0100)]
tests: fix bug in alloca*.test
* tests/alloca.test: Make grepping of automake stderr stricter,
add a trailing `:' command; also, add AC_PROG_CC to configure.in,
and create a dummy alloca.c file, to ensure that we fail for the
proper reason.
* tests/alloca2.test: Likewise. Also, look for LT_INIT, not
AC_PROG_LIBTOOL, in the error message (bug introduced with commit
v1.11-315-gd51e7b7 "libtool: suggest LT_INIT if LTLIBRARIES
primary is used").
From a report by Patrick Welche.
Stefano Lattarini [Fri, 4 Mar 2011 18:09:54 +0000 (19:09 +0100)]
Merge branch 'tests-texinfo' into maint
Stefano Lattarini [Thu, 3 Mar 2011 18:22:55 +0000 (19:22 +0100)]
tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
* tests/comments-in-var-defn.test: The configure.in stub created
by default, which has the AC_INIT first argument obtained by the
test name, causes autoconf 2.62 to fail with a spurious error
message like: "configure.in:1: error: defn: undefined macro:".
Thus, to prevent this, the test is renamed to ...
* tests/comments-in-var-def.test: ... this.
* tests/Makefile.am (TESTS): Updated.
Stefano Lattarini [Fri, 4 Mar 2011 08:25:49 +0000 (09:25 +0100)]
cosmetics: convert encoding from ISO-8859 to UTF-8
* ChangeLog.03: Convert encoding to UTF-8.
* ChangeLog.96: Likewise.
* ChangeLog.98: Likewise.
* NEWS: Likewise.
* TODO: Likewise.
Peter Rosin [Tue, 1 Mar 2011 07:25:24 +0000 (08:25 +0100)]
test defs: unindent without temporary file
* tests/defs.in (commented_sed_unindent_prog): Commented Sed program
that strips the "proper" amount of leading whitespace.
(unindent): Lazily strip comments from the above program and use it
to unindent without using a temporary file.
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Stefano Lattarini [Thu, 24 Feb 2011 09:21:19 +0000 (10:21 +0100)]
libtool: suggest LT_INIT if LTLIBRARIES primary is used
When the LTLIBRARIES primary was used, but $(LIBTOOL) wasn't
defined, automake suggested to add a call to AC_PROG_LIBTOOL
in configure.ac. But that macro is deprecated since Libtool
version 1.9b (2004-08-29), in favor of the newer LT_INIT. So
suggest the use of this latter macro instead.
* lib/Automake/Variable.pm (%_am_macro_for_var): Pair 'LIBTOOL'
with 'LT_INIT', not with 'AC_PROG_LIBTOOL'.
* libtool4.test: Adjust and extend. Also, add a call to macro
AC_PROG_CC in configure.in, to help ensuring that automake does
not fail for the wrong reasons.
* ltinit.test: New test, ensure that automake's libtool support
works with LT_INIT-based interface.
Thanks to Jack Kelly for the suggestion.
Stefano Lattarini [Wed, 16 Feb 2011 19:43:22 +0000 (20:43 +0100)]
tests: tempdirs with restrictive permissions are cleaned correctly
Before this change, the removal of a temporary test directory
containing subdirectories with restrictive permissions (such as
'r--r--r--') could fail.
* tests/defs: Ensure that all the subdirectories of a temporary
test directory have the 'read', 'write' and 'execute' bits set,
before trying to remove it with `rm -rf'.
* tests/Makefile.am (clean-local-check): Likewise.
Stefano Lattarini [Tue, 15 Feb 2011 11:45:28 +0000 (12:45 +0100)]
test defs: add subroutine for input unindenting
* tests/defs.in (unindent): New subroutine.
Stefano Lattarini [Mon, 31 Jan 2011 20:24:02 +0000 (21:24 +0100)]
python: report the 'PYTHON' influential environment variable
* m4/python.m4 (AM_PATH_PYTHON): Call AC_ARG_VAR on PYTHON.
* doc/automake.texi (Python): Update and extend.
* tests/help-python.test: New test.
* tests/Makefile.am (TESTS): Update.
* THANKS (Jack Kelly): Update e-mail address.
Suggestion by Jack Kelly.
Stefano Lattarini [Thu, 10 Feb 2011 09:46:21 +0000 (10:46 +0100)]
tests defs: clear TESTS_ENVIRONMENT variable
* tests/defs.in (TESTS_ENVIRONMENT): Unset it, so that values
from environment won't interfere with the testcases.
Suggestion by Ralf Wildenhues.
Stefano Lattarini [Sun, 6 Feb 2011 18:43:22 +0000 (19:43 +0100)]
tests: tweak few tests on simple and parallel test drivers
* tests/check-exported-srcdir.test: Improve heading comments.
* tests/check-tests-in-builddir.test: Likewise. Also, unset the
`FOO_EXIT_STATUS' variable, so that any pre-existing value in the
environment won't risk to interfere with the test.
Suggestions by Ralf Wildenhues.
Stefano Lattarini [Mon, 24 Jan 2011 14:56:52 +0000 (15:56 +0100)]
coverage: more tests on simple and parallel test drivers
* tests/parallel-tests-subdir.test: New test.
* tests/check-exported-srcdir.test: Likewise.
* tests/check-tests-in-builddir.test: Likewise.
* tests/check-tests_environment.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Sat, 29 Jan 2011 17:47:39 +0000 (18:47 +0100)]
Merge branch 'lflags-test-fixes' into maint
Stefano Lattarini [Sat, 29 Jan 2011 17:35:45 +0000 (18:35 +0100)]
tests: fix spurious failures in lflags*.test
* tests/lflags.test: Remove 'LEX' from the environment, so
that it won't be erroneously picked up by `make -e'.
* tests/lflags2.test: Likewise.
Stefano Lattarini [Mon, 24 Jan 2011 21:26:55 +0000 (22:26 +0100)]
docs: color-tests issues with parallel make
* doc/automake.texi (Simple Tests): Document that automatic
recognition of a capable terminal attached to stdout can fail
with some make implementation when running in parallel mode,
thus causing colored test output not to be automatically
activated when it should.
Ralf Wildenhues [Sun, 23 Jan 2011 10:26:50 +0000 (11:26 +0100)]
tests: avoid instspc.test failures due to make's whitespace trimming
* tests/instspc.test: Prepend './' when passing the test
characters, to avoid leading whitespace characters to be trimmed
from macros set from environment variables. Fixes testsuite
failures with HP-UX, IRIX, and Tru64/OSF make.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 22 Jan 2011 17:09:51 +0000 (18:09 +0100)]
coverage: test semantics of "dummy" per-target flags
* tests/specflg-dummy.test: New test, ensuring that even "dummy"
per-target flags triggers the use of renamed objects.
* tests/Makefile.am (TESTS): Update.
Suggestion by Ralf Wildenhues.
Stefano Lattarini [Sun, 23 Jan 2011 11:54:35 +0000 (12:54 +0100)]
tests defs: sanitize IFS
* tests/defs.in ($IFS): Define to <space>, <tab>, <newline>.
($sp): New variable, holding a single whitespace character.
($tab): New variable, holding a tabulation character.
($nl): New variable, holding a newline character.
Ralf Wildenhues [Sat, 22 Jan 2011 17:21:45 +0000 (18:21 +0100)]
Merge branch 'vpath-autoexp-fix-maint' into maint
* vpath-autoexp-fix-maint:
tests: fix VPATH auto-expansion workarounds.
Ralf Wildenhues [Sat, 22 Jan 2011 17:20:41 +0000 (18:20 +0100)]
tests: fix VPATH auto-expansion workarounds.
* tests/parallel-tests8.test, tests/suffix13.test:
Ensure $< is not surrounded by white space, to prevent Solaris
make from applying automatic VPATH text expansion.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 22 Jan 2011 13:50:20 +0000 (14:50 +0100)]
Merge branch 'yflags-test-fixes' into maint
Stefano Lattarini [Sat, 22 Jan 2011 12:32:14 +0000 (13:32 +0100)]
tests: fix spurious failures in yflags*.test
* tests/yflags.test: Remove 'YACC' from the environment, so
that it won't be erroneously picked up by `make -e'.
* tests/yflags2.test: Likewise.
Ralf Wildenhues [Sat, 22 Jan 2011 12:46:27 +0000 (13:46 +0100)]
tests: avoid fn99*.test failures due to buggy AIX 5.3 cp -R.
* tests/fn99.test, tests/fn99subdir.test: Skip if an initial
`cp -R' of the subdir tree already fails; AIX 5.3 cp messes
up its internal memory when copying this tree.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 22 Jan 2011 10:16:06 +0000 (11:16 +0100)]
Add comment to check-TESTS rule working around make 3.80 bug.
* lib/am/check.am (check-TESTS): Update comment.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Thu, 20 Jan 2011 20:29:42 +0000 (21:29 +0100)]
tests: less strict double-colon spy.test again.
* tests/spy.test: We know BSD make doesn't invoke more than one
double-colon rule, so no need to expose that failure.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Wed, 19 Jan 2011 20:50:02 +0000 (21:50 +0100)]
install-sh: avoid Tru64 sh `test' operator precedence issues.
* lib/install-sh: Protect file names and directory components
that consist of `=', `(', `)', or `!'. Move protection as early
as possible, to avoid errors such as with Tru64 sh `test -z ='.
* tests/instsh2.test: Extend test to cover more possibilities.
Fixes 1.12 instspc-equal-install.test failure on Tru64/OSF 5.1.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Wed, 19 Jan 2011 19:20:37 +0000 (20:20 +0100)]
docs: automake testsuite doesn't use TESTS_ENVIRONMENT anymore
* doc/automake.texi (Simple Tests): Do not claim Automake uses
TESTS_ENVIRONMENT for the perl driver. Instead, point to the
parallel-tests driver.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Wed, 19 Jan 2011 18:46:27 +0000 (19:46 +0100)]
Allow _AM_DEPENDENCIES to be used later in configure.
* m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing
conftest.dir before recreating it.
Fixes bug#7864.
Report by Eric Blake, from report by Scott McCreary against M4.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 18 Jan 2011 22:11:54 +0000 (23:11 +0100)]
tests: avoid failure on w32 file systems.
* tests/parallel-tests-unreadable-log.test: SKIP if file cannot
be turned unreadable.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 16 Jan 2011 21:27:37 +0000 (22:27 +0100)]
tests: allow double-colon spy.test to work with HP-UX make.
* tests/spy.test: Fix comment typos. Ensure prerequisites we
do not want to depend on are strictly older than the target.
Also test with a target out of date wrt. more than one rule.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 16 Jan 2011 18:23:12 +0000 (19:23 +0100)]
tests: remove useless requirements from cond36.test
* tests/cond36.test ($required): Remove.
Since we are at it, add a trailing `:' command.
Ralf Wildenhues [Sun, 16 Jan 2011 12:48:17 +0000 (13:48 +0100)]
parallel-tests: work around Tru64/OSF 5.1 sh read bugs.
* lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
Test file readability before redirecting input from it, to avoid
exiting Tru64/OSF 5.1 sh which treats read as special builtin.
* tests/parallel-tests-unreadable-log.test: New test.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 16 Jan 2011 12:54:57 +0000 (13:54 +0100)]
* NEWS, README: Update copyright years.
Ralf Wildenhues [Sun, 16 Jan 2011 11:12:51 +0000 (12:12 +0100)]
Fix parallel-tests.test failure with HP-UX make.
* tests/parallel-tests.test: Sleep inside inner tests, so logs
are newer than logs of tests they depend on, for HP-UX make.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 16 Jan 2011 11:14:03 +0000 (12:14 +0100)]
Revert "tests: avoid new failures due to nonexistent makeinfo."
This reverts commit
7a42b52f626f3b713196b5946b9bfbb3e173226b.
Ralf Wildenhues [Sun, 16 Jan 2011 09:11:25 +0000 (10:11 +0100)]
Merge branch 'tests-texinfo' into maint
* tests-texinfo:
tests: avoid new failures due to nonexistent makeinfo.
Ralf Wildenhues [Sun, 16 Jan 2011 09:09:57 +0000 (10:09 +0100)]
tests: avoid new failures due to nonexistent makeinfo.
* tests/txinfo.test, tests/txinfo8.test: Create stub info files
so 'missing --run makeinfo' won't fail even if makeinfo is not
present.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
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