Stefano Lattarini [Fri, 2 Sep 2011 08:04:43 +0000 (10:04 +0200)]
Merge branch 'maint'
* maint:
coverage: vala support failing for VPATH from-scratch builds
docs: report few more automake parsing limitations
Stefano Lattarini [Fri, 2 Sep 2011 07:56:20 +0000 (09:56 +0200)]
coverage: vala support failing for VPATH from-scratch builds
* tests/vala-vpath.test: New test, xfailing.
* tests/Makefile.am (TESTS): Update.
* THANKS: Update.
From a report by Zbigniew Jędrzejewski-Szmek.
Related to automake bug#8753.
Stefano Lattarini [Thu, 1 Sep 2011 17:17:39 +0000 (19:17 +0200)]
docs: report few more automake parsing limitations
Partly motivated by automake bug#8360.
* doc/automake.texi (General Operation): Report few more automake
limitations w.r.t. parsing of unusual makefile constructs. Related
minor reorderings.
* tests/doc-parsing-buglets-colneq-subst.test: New test.
* tests/doc-parsing-buglets-tabs.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Thu, 25 Aug 2011 19:22:19 +0000 (21:22 +0200)]
Merge branch 'maint'
* maint:
tests: list "forgotten" test script in TESTS
Stefano Lattarini [Thu, 25 Aug 2011 19:07:12 +0000 (21:07 +0200)]
tests: list "forgotten" test script in TESTS
* tests/Makefile.am (TESTS): Also list ...
* tests/java-empty-classpath.test: ... this test. Since we are
at it, remove trailing whitespace from a couple of lines.
Eric Blake [Thu, 25 Aug 2011 18:46:19 +0000 (12:46 -0600)]
Merge branch 'maint'
Eric Blake [Thu, 25 Aug 2011 18:37:37 +0000 (12:37 -0600)]
ylwrap: fix unusual indentation whitespace
* lib/ylwrap: Convert tabs to spaces.
Reported by Karl Berry.
Signed-off-by: Eric Blake <eblake@redhat.com>
Stefano Lattarini [Thu, 18 Aug 2011 19:47:11 +0000 (21:47 +0200)]
Merge branch 'maint'
* maint:
* THANKS (Daniel Richard G.): Update e-mail address.
java: avoid compilation errors when CLASSPATH is empty
parallel-tests: no more spurious successes for FreeBSD make
hacking: we now require autoconf 2.68
Stefano Lattarini [Wed, 17 Aug 2011 07:53:07 +0000 (09:53 +0200)]
* THANKS (Daniel Richard G.): Update e-mail address.
Daniel Richard G [Tue, 16 Aug 2011 13:19:14 +0000 (15:19 +0200)]
java: avoid compilation errors when CLASSPATH is empty
* lib/am/java.am (CLASSPATH_ENV): When redefining `$CLASSPATH',
do not append an empty component in case the previous value of
CLASSPATH is empty or unset.
* tests/java-empty-classpath.test: New test.
* tests/Makefile.am (TESTS): Update.
Fixes automake bug#9306.
Stefano Lattarini [Fri, 12 Aug 2011 16:29:28 +0000 (18:29 +0200)]
parallel-tests: no more spurious successes for FreeBSD make
Work around a bug of FreeBSD make bug that was causing the
automake-generated "check" target to complete with success
even if some tests failed; this happened only when FreeBSD
make was run in concurrent mode (as in, e.g., "make -j2
check"). The bug is not present in NetBSD make.
This change fixes automake bug#9245:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9245>
See also FreeBSD PR bin/159730:
<http://www.freebsd.org/cgi/query-pr.cgi?pr=159730>
* lib/am/check.am [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Use a
more "safe" (and apparently redundant) idiom to exit with error,
so that the non-zero exit status is picked up also by FreeBSD
make when it's running in concurrent mode.
* NEWS: Update.
* tests/check-concurrency-bug9245.test: New test.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Thu, 11 Aug 2011 21:24:53 +0000 (23:24 +0200)]
hacking: we now require autoconf 2.68
* HACKING ("Working in git"): Use autoconf and autom4te 2.68,
not 2.67, in the examples.
Stefano Lattarini [Wed, 10 Aug 2011 14:03:35 +0000 (16:03 +0200)]
coverage: possible infinite recursion in the test harness
Motivated by a regression in the 'test-protocols' branch.
* tests/parallel-tests-fork-bomb.test: New test, checking that
if $(TEST_SUITE_LOG) is in $(TEST_LOGS), we obtain a diagnosed
error rather than a make hang or a fork bomb.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Wed, 10 Aug 2011 08:44:56 +0000 (10:44 +0200)]
test defs: yet more environment cleanup
* tests/defs: Also unset the TEST_SUITE_LOG variable.
Stefano Lattarini [Tue, 9 Aug 2011 20:44:55 +0000 (22:44 +0200)]
tests: fix various blunders in 'suffix-chain.test'
* tests/suffix-chain.test: Fix various blunders that were causing
this test to fail spuriously: append to `configure.in', not to
`configure.ac'; add a `;' character after the `return' statement
in an input file; use tabs, not spaces, to indent Makefile recipes;
and use more uncommon suffixes that don't trigger built-in recipes
with FreeBSD make.
Stefano Lattarini [Tue, 9 Aug 2011 15:51:51 +0000 (17:51 +0200)]
tests: don't let a known Solaris make bug poison too many tests
See automake bug#7670 and bug#7824.
* tests/defs (make_can_chain_suffix_rules): New function, tell
whether the make implementation in use can chain suffix rules
automatically or not.
* tests/suffix3.test: Use it to avoid issuing calls to make that
are unportable to make implementations that are not smart enough
to chain suffix rules automatically.
* tests/suffix8.test: Use it to avoid issuing calls to make that
* tests/suffix10.test: Use it to avoid issuing calls to make that
* tests/suffix11.test: Use it to avoid issuing calls to make that
* tests/suffix-chain.test: New test, exposes the limitation that
we have papered over in the tests above.
Stefano Lattarini [Tue, 9 Aug 2011 14:43:08 +0000 (16:43 +0200)]
gitignore: more use of anchors
* .gitignore: Anchor files that are intended to be ignored only
if found in the same directory of the `.gitignore' file, not also
in its subdirectories.
* doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
lib/Automake/tests/.gitignore, tests/.gitignore: Likewise. Also,
where needed, add new entries that were once implied by the
non-anchored entries in the upper-level `.gitignore' files.
Stefano Lattarini [Tue, 9 Aug 2011 13:24:03 +0000 (15:24 +0200)]
testsuite: avoid spurious failure of self checks on Solaris
This is just a quick workaround to prevent having too much noise
in the testsuite; more proper fixes have been committed into the
'testsuite-work' branch.
* tests/self-check-dir.test: Relax a test to avoid unimportant
failure on Solaris 10.
* tests/self-check-exit.test: Likewise.
Stefano Lattarini [Mon, 8 Aug 2011 12:40:59 +0000 (14:40 +0200)]
Merge branch 'maint'
* maint:
test defs: more environment cleanup
Stefano Lattarini [Mon, 8 Aug 2011 12:39:16 +0000 (14:39 +0200)]
test defs: more environment cleanup
* tests/defs.in: Also unset variables AM_COLOR_TESTS and
AM_TESTS_ENVIRONMENT.
Stefano Lattarini [Mon, 8 Aug 2011 08:29:25 +0000 (10:29 +0200)]
Merge branch 'maint'
* maint:
tests: fix spurious failure with Solaris make
Stefano Lattarini [Mon, 8 Aug 2011 08:25:00 +0000 (10:25 +0200)]
Merge branch 'am-distcheck-configure-flags' into maint
* am-distcheck-configure-flags:
tests: fix spurious failure with Solaris make
Stefano Lattarini [Mon, 8 Aug 2011 08:20:47 +0000 (10:20 +0200)]
tests: fix spurious failure with Solaris make
* tests/distcheck-configure-flags-am.test: Avoid using `+=' too
liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
so introduced, in conjunction with single quotes, might confuse
Solaris make.
Stefano Lattarini [Wed, 3 Aug 2011 14:40:15 +0000 (16:40 +0200)]
Merge branch 'maint'
* maint:
maintcheck: fix maintainer-check failures, both real and spurious
Stefano Lattarini [Wed, 3 Aug 2011 14:35:49 +0000 (16:35 +0200)]
maintcheck: fix maintainer-check failures, both real and spurious
* tests/amhello-binpkg.test: Use "$MAKE", not bare "make".
* Makefile.am (sc_perl_local): Also allow perl special variable
`$~' to be localized. And be slightly laxer in the regexp, to
allow for usages like "local $_ = $foo;".
(sc_tests_overriding_macros_on_cmdline): Also allow for command
line overriding of the `DISABLE_HARD_ERRORS' make variable. Try
to avoid false positives for usages like "$MAKE || st=$?".
Stefano Lattarini [Wed, 3 Aug 2011 13:09:43 +0000 (15:09 +0200)]
Merge branch 'maint'
* maint:
docs: how to use '-I' option in AM_CPPFLAGS for best VPATH support
Bruno Haible [Wed, 3 Aug 2011 13:05:22 +0000 (15:05 +0200)]
docs: how to use '-I' option in AM_CPPFLAGS for best VPATH support
* doc/automake.texi (Program Variables): Recommend -I options to
both the build directory and the source directory when needed.
Stefano Lattarini [Sun, 24 Jul 2011 09:17:11 +0000 (11:17 +0200)]
Merge branch 'maint'
* maint:
tests: relax a test on amhello examples to cater to Solaris tar
Stefano Lattarini [Sat, 23 Jul 2011 13:10:07 +0000 (15:10 +0200)]
Merge branch 'fix-amhello-examples-tests' into maint
* fix-amhello-examples-tests:
tests: relax a test on amhello examples to cater to Solaris tar
Stefano Lattarini [Sat, 23 Jul 2011 13:09:23 +0000 (15:09 +0200)]
tests: relax a test on amhello examples to cater to Solaris tar
* tests/amhello-binpkg.test: When the tar implementation in use
is not GNU tar, relax the tests on tar output, to avoid spurious
failures. For example, "tar cvf ..." with GNU tar can output
lines like "./usr/bin/hello" on the standard output, while with
Solaris tar it can output lines like "a ./usr/bin/hello 8K" on
standard output, and with Heirloom tar it can output lines like
"a ./usr/bin/hello 15 tape blocks" on standard error.
Stefano Lattarini [Sat, 23 Jul 2011 11:55:20 +0000 (13:55 +0200)]
test defs: function 'is_newest' now works also with directories
* tests/defs (is_newest): Call `find' with the `-prune' option,
so that it won't descend in the directories (which could cause
spurious results).
* tests/self-check-is_newest: Extend accordingly.
From a report by Jim Meyering, see automake bug#9147.
Stefano Lattarini [Fri, 22 Jul 2011 08:27:13 +0000 (10:27 +0200)]
Merge branch 'maint'
* maint:
docs: add references between the 2 sections on java support
Benoit Sigoure [Fri, 15 Jul 2011 23:49:45 +0000 (16:49 -0700)]
docs: add references between the 2 sections on java support
* doc/automake.texi (Java Support, Java): Add cross-references.
Ralf Wildenhues [Wed, 20 Jul 2011 21:35:32 +0000 (23:35 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Wed, 20 Jul 2011 21:31:54 +0000 (23:31 +0200)]
Sync auxiliary files from upstream.
* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
lib/texinfo.tex: Sync from upstream.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 8 Jul 2011 09:57:19 +0000 (11:57 +0200)]
Merge branch 'maint'
* maint:
fix typo in recent ChangeLog entry
docs, tests: synchronize examples on silent-rules from config.site
tests: fix weakness in 'tests-environment-backcompat.test'
Stefano Lattarini [Fri, 8 Jul 2011 08:48:23 +0000 (10:48 +0200)]
Merge branch 'fix-tests-environment-backcompat-example' into maint
* fix-tests-environment-backcompat-example:
tests: fix weakness in 'tests-environment-backcompat.test'
Stefano Lattarini [Fri, 8 Jul 2011 08:48:22 +0000 (10:48 +0200)]
Merge branch 'fix-changelog-typo' into maint
* fix-changelog-typo:
fix typo in recent ChangeLog entry
Stefano Lattarini [Fri, 8 Jul 2011 08:48:22 +0000 (10:48 +0200)]
Merge branch 'doc-silent-rules-reference-config-site-test' into maint
* doc-silent-rules-reference-config-site-test:
docs, tests: synchronize examples on silent-rules from config.site
Stefano Lattarini [Fri, 8 Jul 2011 08:45:53 +0000 (10:45 +0200)]
fix typo in recent ChangeLog entry
Stefano Lattarini [Fri, 8 Jul 2011 08:43:33 +0000 (10:43 +0200)]
docs, tests: synchronize examples on silent-rules from config.site
* doc/automake.texi (Automake silent-rules Option): Reference test
'silent-configsite.test' in comments.
Stefano Lattarini [Fri, 8 Jul 2011 08:34:54 +0000 (10:34 +0200)]
tests: fix weakness in 'tests-environment-backcompat.test'
* tests/tests-environment-backcompat.test: Do not override the
content of xfailing test `baz.test' with a "weaker" version that
fails unconditionally: the test must fail only when the 'strict'
pragma is in use, in order not to reduce coverage.
Stefano Lattarini [Fri, 8 Jul 2011 07:54:38 +0000 (09:54 +0200)]
Merge branch 'maint'
* maint:
tests: portability fixes in tests on amhello examples
remake: add test ensuring that slower remakes don't hang
remake: fix outdated comment in configure.am
Stefano Lattarini [Fri, 8 Jul 2011 07:41:27 +0000 (09:41 +0200)]
Merge branch 'fix-amhello-examples-tests' into maint
* fix-amhello-examples-tests:
tests: portability fixes in tests on amhello examples
Stefano Lattarini [Wed, 6 Jul 2011 08:31:03 +0000 (10:31 +0200)]
tests: portability fixes in tests on amhello examples
* tests/amhello-binpkg.test: Don't use "tar xzf too.tag.gz" to
extract a gzip-compressed tarball, that's unportable to some
tar implementations; use the "gzip -dc fo.tar.gz | tar xf -"
idiom instead.
* tests/amhello-cflags.test: Likewise.
* tests/amhello-cross-compile.test: Likewise.
Suggestion from Ralf Wildenhues.
Stefano Lattarini [Mon, 4 Jul 2011 09:44:39 +0000 (11:44 +0200)]
Merge branch 'remake-rules-non-GNU-make' into maint
* remake-rules-non-GNU-make:
remake: add test ensuring that slower remakes don't hang
remake: fix outdated comment in configure.am
Stefano Lattarini [Mon, 4 Jul 2011 09:41:34 +0000 (11:41 +0200)]
remake: add test ensuring that slower remakes don't hang
* tests/remake-subdir-long-time.test: New test.
* tests/Makefile.am (TESTS): Update.
Suggestion by Ralf Wildenhues.
Stefano Lattarini [Mon, 4 Jul 2011 08:54:02 +0000 (10:54 +0200)]
remake: fix outdated comment in configure.am
* lib/am/configure.am: Fix comment falsified by changes in
commit `v1.11-366-gbee9871'.
Suggestion by Ralf Wildenhues.
Stefano Lattarini [Sun, 3 Jul 2011 13:45:02 +0000 (15:45 +0200)]
Merge branch 'maint'
* maint:
docs, tests: synchronize examples from docs to tests
Stefano Lattarini [Thu, 30 Jun 2011 18:05:25 +0000 (20:05 +0200)]
docs, tests: synchronize examples from docs to tests
* tests/README (Writing test cases): Give suggestions on how to
keep test cases and examples in the documentation synchronized.
* doc/automake.texi: Improve or fix existing testcase-referencing
comments, and add many new ones.
* HACKING (Administrivia): Suggest to test complex examples and
idioms from the manual.
* tests/specflg8.test: Improve synchronization with the example
in the manual.
* tests/output11.test:Likewise.
* tests/txinfo21.test:Likewise.
* tests/interp.test: Likewise. Since we are at it, and enable
the `errexit' shell flag, do related changes, and add trailing
`:'command.
* tests/amhello-cflags.test: New test.
* tests/amhello-cross-compile.test: Likewise.
* tests/amhello-binpkg.test: Likewise.
* tests/tests-environment-backcompat: Likewise.
* tests/parallel-tests-log-compiler-example.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Thu, 30 Jun 2011 14:37:19 +0000 (16:37 +0200)]
coverage: new test on parallel-tests TESTS runtime overriding
* tests/parallel-tests-cmdline-override.test: New test, check that
we can use indirections when overriding TESTS and TEST_LOGS from
the command line.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Thu, 30 Jun 2011 15:21:47 +0000 (17:21 +0200)]
Merge branch 'maint'
* maint:
cosmetics: fix typos in recent ChangeLog entries
Stefano Lattarini [Thu, 30 Jun 2011 15:20:40 +0000 (17:20 +0200)]
cosmetics: fix typos in recent ChangeLog entries
Stefano Lattarini [Wed, 29 Jun 2011 07:53:31 +0000 (09:53 +0200)]
Merge branch 'am-tests-environment'
* am-tests-environment:
docs: explain why AM_TESTS_ENVIRONMENT must be semicolon-terminated
docs: fix unportable example of AM_TESTS_ENVIRONMENT usage
Stefano Lattarini [Wed, 29 Jun 2011 07:44:14 +0000 (09:44 +0200)]
docs: explain why AM_TESTS_ENVIRONMENT must be semicolon-terminated
* doc/automake.texi (Simple Tests using parallel-tests): Ditto, and
related adjustments.
Suggestion by Ralf Wildenhues.
Stefano Lattarini [Thu, 23 Jun 2011 17:05:44 +0000 (19:05 +0200)]
docs: fix unportable example of AM_TESTS_ENVIRONMENT usage
* doc/automake.texi (Simple Tests using parallel-tests): The
old example on AM_TESTS_ENVIRONMENT relied on unportable shell
features, and in particular didn't work with various Korn
Shells (see also commit `v1.11-925-g29ca903'). Give another
example, simpler this time, but still inspired to real-world
usage (the GNU coreutils testsuite).
Stefano Lattarini [Tue, 28 Jun 2011 09:26:15 +0000 (11:26 +0200)]
Merge branch 'maint'
* maint:
Revert "docs: parallel-tests is not experimental anymore"
parallel-tests: stricter checks on DISABLE_HARD_ERRORS support
docs: parallel-tests is not experimental anymore
check: document and test $(TEST_SUITE_LOG) overriding
Stefano Lattarini [Tue, 28 Jun 2011 06:15:21 +0000 (08:15 +0200)]
Merge branch 'parallel-tests-maint' into maint
* parallel-tests-maint:
Revert "docs: parallel-tests is not experimental anymore"
parallel-tests: stricter checks on DISABLE_HARD_ERRORS support
docs: parallel-tests is not experimental anymore
check: document and test $(TEST_SUITE_LOG) overriding
Stefano Lattarini [Mon, 27 Jun 2011 13:36:37 +0000 (15:36 +0200)]
Merge branch 'maint'
* maint:
docs: avoid a footnote, some related rewordings and improvements
docs: minor cosmetic fixes
Stefano Lattarini [Thu, 23 Jun 2011 21:31:27 +0000 (23:31 +0200)]
docs: avoid a footnote, some related rewordings and improvements
* doc/automake.texi (Dist): Reword the part about automatically
distributed files to avoid a footnote. Since we are at it, extend
a bit, and add an example and a reference to a relevant test case.
Stefano Lattarini [Fri, 24 Jun 2011 07:15:14 +0000 (09:15 +0200)]
Revert "docs: parallel-tests is not experimental anymore"
This reverts commit
a9eef973b5ea47cc3495f1a8307d4f7b85aea46f.
It turned out that the current work to introduce TAP and SubUnit
support in Automake-generated testsuite harnesses will probably
require the introduction of slight incompatibilities in the
'parallel-tests' behaviour, starting from release 1.12 onward.
So it's advisable to continue to characterize the 'parallel-tests'
support as "experimental" in maintenance release 1.11.2.
Suggestion from Ralf Wildenhues.
Stefano Lattarini [Thu, 23 Jun 2011 16:38:34 +0000 (18:38 +0200)]
docs: minor cosmetic fixes
* doc/automake.texi: Break few overly long lines, throughout the
file.
("Simple Tests"): Move @vindex for XFAIL_TESTS to the correct
position, i.e., before and not after the paragraph where it is
introduced.
("Options" @item ansi2knr): Use @pxref instead of @xref. This
fixes a texinfo warning.
("Other things Automake recognizes" @item AM_C_PROTOTYPES): Use
@pxref instead of @ref.
Stefano Lattarini [Thu, 23 Jun 2011 08:52:08 +0000 (10:52 +0200)]
Merge branch 'maint'
* maint:
help: improve text about automatically-distributed files
refactor: split 'usage' subroutine in automake
Stefano Lattarini [Wed, 12 Jan 2011 00:27:07 +0000 (01:27 +0100)]
help: improve text about automatically-distributed files
This change fixes automake bug#7819.
* automake.in (usage): Distinguish between files that are always
automatically distributed when found, and those which are only
"under certain conditions".
* doc/automake.texi (Basics of Distribution): Update accordingly.
* tests/autodist-subdir.test: Update.
* tests/autodist-no-duplicate.test: Likewise.
* tests/autodist.test: Likewise.
(configure.in): Remove useless call to AM_MAINTAINER_MODE.
Stefano Lattarini [Wed, 12 Jan 2011 00:06:33 +0000 (01:06 +0100)]
refactor: split 'usage' subroutine in automake
This change is related to automake bug#7819.
* automake.in (print_autodist_files): New subroutine,
extracted from ...
(usage): ... this, which now uses it.
* tests/autodist-no-duplicate.test: New test.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Thu, 23 Jun 2011 08:34:39 +0000 (10:34 +0200)]
Merge branch 'maint'
* maint:
tests: fix bug in 'autodist.test'
Stefano Lattarini [Thu, 23 Jun 2011 08:32:12 +0000 (10:32 +0200)]
tests: fix bug in 'autodist.test'
* tests/autodist.test: Avoid spurious failure due to no
`defs-static' file being found in the parent directory.
Stefano Lattarini [Tue, 21 Jun 2011 20:24:26 +0000 (22:24 +0200)]
Merge branch 'maint'
Stefano Lattarini [Mon, 20 Jun 2011 21:52:34 +0000 (23:52 +0200)]
maintcheck: extend 'sc_tests_plain_*' checks
* Makefile.am (sc_tests_plain_autom4te): New check.
(sc_tests_plain_autoreconf): Likewise.
(sc_tests_plain_autoheader): Likewise.
(syntax_check_rules): Update.
Stefano Lattarini [Tue, 21 Jun 2011 11:17:50 +0000 (13:17 +0200)]
tests: interactions between TESTS_ENVIRONMENT and LOG_COMPILER
* tests/tests-environment-and-log-compiler.test: New test,
checking that we can use variables and functions set by
TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER
and LOG_FLAGS (for tests both with and without registered
extensions).
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Mon, 20 Jun 2011 15:00:37 +0000 (17:00 +0200)]
Merge branch 'maint'
* maint:
maintcheck: avoid few spurious failures
Stefano Lattarini [Mon, 20 Jun 2011 14:42:10 +0000 (16:42 +0200)]
maintcheck: avoid few spurious failures
* Makefile.am (sc_tests_plain_aclocal, sc_tests_plain_perl,
sc_tests_plain_autoconf, sc_tests_plain_automake,
sc_tests_plain_autoupate): Be stricter in matching an erroneous
literal command, i.e., `aclocal', `automake', `perl', etc.
Stefano Lattarini [Mon, 20 Jun 2011 08:49:09 +0000 (10:49 +0200)]
Merge branch 'maint' into parallel-tests-maint
* maint:
check: don't use multi-line coloring for the report
ansi2knr: deprecate, it will go away in the next major release
docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
docs: replace obsolete @vindex entry with a useful one
docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
Stefano Lattarini [Mon, 20 Jun 2011 08:46:09 +0000 (10:46 +0200)]
Merge branch 'maint'
* maint:
check: don't use multi-line coloring for the report
ansi2knr: deprecate, it will go away in the next major release
docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
docs: replace obsolete @vindex entry with a useful one
docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
Bert Wesarg [Fri, 17 Jun 2011 19:59:52 +0000 (21:59 +0200)]
check: don't use multi-line coloring for the report
"less -R" can't handle multi-line coloring as it is done for the
check reports of the serial and parallel testsuite, because of
performance reasons. Thus, color each line of the check report
by its own.
* lib/am/check.am (am__text_box): Accept colors for lines, and
color each line by its own.
[%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Let am__text_box handle
the line coloring.
[!%?PARALLEL_TESTS%] $(check-TESTS): Color each report line by
its own.
* THANKS: Update.
Stefano Lattarini [Mon, 20 Jun 2011 07:43:25 +0000 (09:43 +0200)]
Merge branch 'am-distcheck-configure-flags' into maint
Stefano Lattarini [Mon, 13 Jun 2011 19:27:35 +0000 (21:27 +0200)]
ansi2knr: deprecate, it will go away in the next major release
* doc/automake.texi: Loudly and repeatedly state that the old
de-ANSI-fication features are now deprecated and will be removed
in the next major Automake release. Other related adjustments.
* lib/Automake/Options.pm (_process_option_list ): Give a warning
in the `obsolete' category when the `ansi2knr' option is used.
* m4/protos.m4 (AM_C_PROTOTYPES): Deprecate this macro: a warning
in the `obsolete' category will be emitted it if is used.
* tests/ansi2knr-deprecation.test: New test.
* tests/Makefile.am (TESTS): Update.
* tests/ansi.test: Adjust, by calling autoconf and/or automake
with the `-Wno-obsolete' flag.
* tests/ansi10.test: Likewise.
* tests/ansi2.test: Likewise.
* tests/ansi3.test: Likewise.
* tests/ansi3b.test: Likewise.
* tests/ansi4.test: Likewise.
* tests/ansi5.test: Likewise.
* tests/ansi6.test: Likewise.
* tests/ansi7.test: Likewise.
* tests/ansi8.test: Likewise.
* tests/ansi9.test: Likewise.
* tests/cxxansi.test: Likewise.
* tests/libobj8.test: Likewise.
* NEWS: Update about the future planned backward-incompatibility
due to the removal of de-ANSI-fication feature.
Stefano Lattarini [Sun, 19 Jun 2011 11:15:49 +0000 (13:15 +0200)]
docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
* doc/automake.texi (Program Sources): pkglib_PROGRAMS is not a
valid combination anymore, so don't document it. Inconsistency
introduced in commit `v1.11-373-g9ca6326'.
Jim Meyering [Sun, 19 Jun 2011 10:32:59 +0000 (12:32 +0200)]
docs: replace obsolete @vindex entry with a useful one
* doc/automake.texi (Program Sources): Do not index obsolete
pkglib_PROGRAMS here. Do index pkglibexec_PROGRAMS.
Stefano Lattarini [Sat, 18 Jun 2011 17:16:41 +0000 (19:16 +0200)]
Merge branch 'test-fd-redirect'
* test-fd-redirect:
tests: more checks on portable fd redirection in TESTS_ENVIRONMENT
Stefano Lattarini [Sat, 18 Jun 2011 12:53:08 +0000 (14:53 +0200)]
tests: more checks on portable fd redirection in TESTS_ENVIRONMENT
* tests/tests-environment-fd-redirect.test: Extend by also using
a perl script among the tests. Run the test shell script with
the `errexit' flag active. Export `VERBOSE' to yes when running
"make check", to give more debugging information in case of
failures. Look for a Korn Shell also in `/usr/bin', not on only
in `/bin'.
Stefano Lattarini [Wed, 15 Jun 2011 08:50:03 +0000 (10:50 +0200)]
docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
* doc/automake.texi (Checking the Distribution): Explain that the
developers should take care of making their code buildable without
requiring any special configure options, so that in general
AM_DISTCHECK_CONFIGURE_FLAGS shouldn't be used. Give an example
of where its use is legitimate.
Stefano Lattarini [Thu, 16 Jun 2011 15:21:00 +0000 (17:21 +0200)]
Merge branch 'maint' into parallel-tests-maint
* maint:
news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
tests: optimize tests on primary/prefix mismatch for speed
Warnings about primary/prefix mismatch fixed and extended.
maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
docs: better documentation for silent make rules
Stefano Lattarini [Thu, 16 Jun 2011 14:56:36 +0000 (16:56 +0200)]
Merge branch 'maint'
* maint:
news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
tests: optimize tests on primary/prefix mismatch for speed
Warnings about primary/prefix mismatch fixed and extended.
maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
docs: better documentation for silent make rules
Stefano Lattarini [Tue, 14 Jun 2011 07:41:14 +0000 (09:41 +0200)]
tests: check portable fd redirection in TESTS_ENVIRONMENT
* tests/tests-environment-fd-redirect.test: New test.
* tests/Makefile.am (TESTS): Update.
Motivated by coreutils bug#8846:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8846>
See also following CC:ed thread on bug-autoconf list:
<http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
Stefano Lattarini [Thu, 16 Jun 2011 08:29:32 +0000 (10:29 +0200)]
Merge branch 'more-prefix-primary-diagnostic' into maint
Stefano Lattarini [Mon, 13 Jun 2011 19:42:06 +0000 (21:42 +0200)]
Merge branch 'am-distcheck-configure-flags' into maint
* am-distcheck-configure-flags:
news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
Stefano Lattarini [Mon, 13 Jun 2011 19:40:57 +0000 (21:40 +0200)]
news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
* NEWS (Miscellaneous changes): Update.
Stefano Lattarini [Mon, 13 Jun 2011 18:16:16 +0000 (20:16 +0200)]
Merge branch 'am-distcheck-configure-flags' into maint
* am-distcheck-configure-flags:
maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
Stefano Lattarini [Mon, 13 Jun 2011 09:07:20 +0000 (11:07 +0200)]
Merge branch 'silent-rules-doc' into maint
Stefano Lattarini [Mon, 13 Jun 2011 08:51:57 +0000 (10:51 +0200)]
tests: optimize tests on primary/prefix mismatch for speed
* tests/primary-prefix-invalid-couples.test: Partial rewrite, in
order to use just a single automake invocation rather than one
invocation for each invalid primary/prefix couple. This improves
the test script execution time by an order of magnitude.
Since we are at it, throw in some other improvements to avoid
unrelated automake warnings and failures that could potentially
cause false positives w.r.t. the automake exit status.
Stefano Lattarini [Thu, 16 Dec 2010 18:23:06 +0000 (19:23 +0100)]
Warnings about primary/prefix mismatch fixed and extended.
* automake.in (%standard_prefix): Add `doc' and `locale'.
Rename `pkgdatadir' to `pkgdata'. Similarly for`pkglibdir',
`pkgincludedir' and `pkglibexecdir'.
(handle_programs): List `pkglibexec', not `pkglib', among the
prefixes valid for the `PROGRAMS' primary.
(handle_data): List also `doc' among the prefixes valid for
the `DATA' primary. This is required by automake's own build
system.
* tests/dirforbid.test: Test removed, superseded by ...
* tests/primary-prefix-invalid-couples.test: ... this new test.
* tests/primary-prefix-valid-couples.test: New test.
* tests/primary-prefix-documented-valid.test: Likewise.
* tests/primary-prefix-force-valid.test: Likewise.
* tests/java3.test: Adjusted, and extended a bit.
* tests/Makefile.am (TESTS): Updated.
* NEWS: Updated.
From a report by Eric Blake.
Stefano Lattarini [Sat, 11 Jun 2011 10:52:51 +0000 (12:52 +0200)]
Merge branch 'maint' into parallel-tests-maint
* maint:
test defs: new function 'fatal_', for hard errors
Stefano Lattarini [Sat, 11 Jun 2011 10:47:56 +0000 (12:47 +0200)]
Merge branch 'maint'
* maint:
test defs: new function 'fatal_', for hard errors
Stefano Lattarini [Fri, 10 Jun 2011 15:13:17 +0000 (17:13 +0200)]
maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
* Makefile.am (sc_tests_overriding_macros_on_cmdline): It's now
acceptable that the test scripts override DISTCHECK_CONFIGURE_FLAGS
on the make command line. Update comments accordingly. Since we
are at it, make the relevant grepping rules slightly tighter.
Stefano Lattarini [Fri, 10 Jun 2011 10:26:42 +0000 (12:26 +0200)]
distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
* doc/automake.texi (Checking the Distribution): Suggest to use
AM_DISTCHECK_CONFIGURE_FLAGS, not DISTCHECK_CONFIGURE_FLAGS, to
define (in the top-level Makefile.am) extra flags to be passed
to configure at "make distcheck" time; DISTCHECK_CONFIGURE_FLAGS
should be reserved for the user. Add proper `@vindex' directive.
Document that AM_DISTCHECK_CONFIGURE_FLAGS is not honoured in a
subpackage Makefile.am, but the flags in it are passed down to
the configure script of the subpackage.
* lib/am/distdir.am (distcheck): Also pass the flags in
$(AM_DISTCHECK_CONFIGURE_FLAGS) to the configure invocation.
Update comments.
* tests/defs.in.test (AM_DISTCHECK_CONFIGURE_FLAGS,
DISTCHECK_CONFIGURE_FLAGS): Unset in case they are exported in
the environment, they might improperly influence our testsuite.
* tests/distcheck-configure-flags.test: New test.
* tests/distcheck-configure-flags-am.test: Likewise.
* tests/distcheck-configure-flags-subpkg.test: Likewise.
* distcheck-hook.test: Likewise.
* distcheck-hook2.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Closes automake bug#8487.
Stefano Lattarini [Fri, 12 Nov 2010 19:26:59 +0000 (20:26 +0100)]
docs: better documentation for silent make rules
* doc/automake.texi (Options): Detailed description of the
automake option `silent-rules' moved from here ...
(Silent Make): ... into this new chapter, expanded, improved,
and subdivided into ...
(Make verbosity, Tricks For Silencing Make,
Automake silent-rules Option): ... these new sections.
(@menu, @detailmenu): Update.
* tests/silent-configsite.test: New test, checking that the
user can control default mode of silent-rules from config.site,
as is documented in the manual.
* tests/Makefile.am (TESTS): Updated.
Stefano Lattarini [Tue, 7 Jun 2011 13:24:11 +0000 (15:24 +0200)]
test defs: new function 'fatal_', for hard errors
Before this patch, the only way offered by tests/defs to
properly signal a hard error was the `framework_failure_'
function. But the error message issued by that function,
as its name would suggest, refers to a set-up failure in the
testsuite, while hard errors can obviously also be due to
other reasons. The best way to fix this inconsistency is to
introduce a new function with a more general error message.
Inspired by a recent similar change to Gnulib's tests/init.sh.
* tests/defs.in (fatal_): New function.
* tests/README (Section "Writing test cases" subsection "Do"):
Suggest the use of `fatal_', not of `framework_failure_', for
generic hard errors. The latter should be reserved for "real"
set-up failures.
Stefano Lattarini [Wed, 8 Jun 2011 08:03:29 +0000 (10:03 +0200)]
Merge branch 'fix-auxdir2-test'
Stefano Lattarini [Sun, 5 Jun 2011 19:44:53 +0000 (21:44 +0200)]
tests: fix typo-related error in auxdir2.test
* tests/auxdir2.test (configure.in): Close m4 quoting in the
argument to AC_CONFIG_AUX_DIR. Without this, aclocal fails with
"ERROR: end of file in string". This problem hasn't been exposed
by the testsuite before because this test is in XFAIL_TESTS, so
its failure went unnoticed, even if it was due to a wrong cause.
Bug introduced in commit v1.11-249-g49ac3de.