platform/upstream/automake.git
13 years agoMerge branch 'maint'
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'

13 years agoMerge branch 'fix-tests-environment-backcompat-example' into maint
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'

13 years agoMerge branch 'fix-changelog-typo' into maint
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

13 years agoMerge branch 'doc-silent-rules-reference-config-site-test' into maint
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

13 years agofix typo in recent ChangeLog entry
Stefano Lattarini [Fri, 8 Jul 2011 08:45:53 +0000 (10:45 +0200)]
fix typo in recent ChangeLog entry

13 years agodocs, tests: synchronize examples on silent-rules from config.site
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.

13 years agotests: fix weakness in 'tests-environment-backcompat.test'
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.

13 years agoMerge branch 'maint'
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

13 years agoMerge branch 'fix-amhello-examples-tests' into maint
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

13 years agotests: 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.

13 years agoMerge branch 'remake-rules-non-GNU-make' into maint
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

13 years agoremake: add test ensuring that slower remakes don't hang
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.

13 years agoremake: fix outdated comment in configure.am
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.

13 years agoMerge branch 'maint'
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

13 years agodocs, 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.

13 years agocoverage: new test on parallel-tests TESTS runtime overriding
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 30 Jun 2011 15:21:47 +0000 (17:21 +0200)]
Merge branch 'maint'

* maint:
  cosmetics: fix typos in recent ChangeLog entries

13 years agocosmetics: 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

13 years agoMerge branch 'am-tests-environment'
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

13 years agodocs: explain why AM_TESTS_ENVIRONMENT must be semicolon-terminated
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.

13 years agodocs: fix unportable example of AM_TESTS_ENVIRONMENT usage
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).

13 years agoMerge branch 'maint'
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

13 years agoMerge branch 'parallel-tests-maint' into maint
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

13 years agoMerge branch 'maint'
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

13 years agodocs: avoid a footnote, some related rewordings and improvements
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.

13 years agoRevert "docs: parallel-tests is not experimental anymore"
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.

13 years agodocs: minor cosmetic fixes
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.

13 years agoMerge branch 'maint'
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

13 years agohelp: improve text about automatically-distributed files
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.

13 years agorefactor: split 'usage' subroutine in automake
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 23 Jun 2011 08:34:39 +0000 (10:34 +0200)]
Merge branch 'maint'

* maint:
  tests: fix bug in 'autodist.test'

13 years agotests: 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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Tue, 21 Jun 2011 20:24:26 +0000 (22:24 +0200)]
Merge branch 'maint'

13 years agomaintcheck: extend 'sc_tests_plain_*' checks
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.

13 years agotests: interactions between TESTS_ENVIRONMENT and LOG_COMPILER
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 20 Jun 2011 15:00:37 +0000 (17:00 +0200)]
Merge branch 'maint'

* maint:
  maintcheck: avoid few spurious failures

13 years agomaintcheck: 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.

13 years agoMerge branch 'maint' into parallel-tests-maint
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

13 years agoMerge branch 'maint'
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

13 years agocheck: don't use multi-line coloring for the report
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.

13 years agoMerge branch 'am-distcheck-configure-flags' into maint
Stefano Lattarini [Mon, 20 Jun 2011 07:43:25 +0000 (09:43 +0200)]
Merge branch 'am-distcheck-configure-flags' into maint

13 years agoansi2knr: deprecate, it will go away in the next major release
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.

13 years agodocs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
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'.

13 years agodocs: replace obsolete @vindex entry with a useful one
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.

13 years agoMerge branch 'test-fd-redirect'
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

13 years agotests: 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'.

13 years agodocs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
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.

13 years agoMerge branch 'maint' into parallel-tests-maint
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

13 years agoMerge branch 'maint'
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

13 years agotests: check portable fd redirection in TESTS_ENVIRONMENT
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>

13 years agoMerge branch 'more-prefix-primary-diagnostic' into maint
Stefano Lattarini [Thu, 16 Jun 2011 08:29:32 +0000 (10:29 +0200)]
Merge branch 'more-prefix-primary-diagnostic' into maint

13 years agoMerge branch 'am-distcheck-configure-flags' 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

13 years agonews: 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.

13 years agoMerge branch 'am-distcheck-configure-flags' into maint
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

13 years agoMerge branch 'silent-rules-doc' into maint
Stefano Lattarini [Mon, 13 Jun 2011 09:07:20 +0000 (11:07 +0200)]
Merge branch 'silent-rules-doc' into maint

13 years agotests: optimize tests on primary/prefix mismatch for speed
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.

13 years agoWarnings about primary/prefix mismatch fixed and extended.
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.

13 years agoMerge branch 'maint' into parallel-tests-maint
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

13 years agoMerge branch 'maint'
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

13 years agomaintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
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.

13 years agodistcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
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.

13 years agodocs: better documentation for silent make rules
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.

13 years agotest defs: new function 'fatal_', for hard errors
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.

13 years agoMerge branch 'fix-auxdir2-test'
Stefano Lattarini [Wed, 8 Jun 2011 08:03:29 +0000 (10:03 +0200)]
Merge branch 'fix-auxdir2-test'

13 years agotests: fix typo-related error in 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.

13 years agoMerge branch 'maint' into parallel-tests-maint
Stefano Lattarini [Fri, 3 Jun 2011 09:37:46 +0000 (11:37 +0200)]
Merge branch 'maint' into parallel-tests-maint

* maint:
  maintcheck: fix some failures, extend some checks
  automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
  build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
  remake: behave better with non-GNU make in subdirectories
  tests/README: fix example about `make -e' usage

13 years agomaintcheck: fix some more failures
Stefano Lattarini [Thu, 2 Jun 2011 10:47:58 +0000 (12:47 +0200)]
maintcheck: fix some more failures

* tests/instdir-ltlib.test: Use creative quoting to avoid
spuriously triggering the `sc_rm_minus_f' maintainer check.
* tests/instdir-prog.test: Likewise.
* tests/instspc-data.test: Use creative quoting to avoid
spuriously triggering the `sc_tests_Exit_not_exit' maintainer
check.

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 2 Jun 2011 10:17:40 +0000 (12:17 +0200)]
Merge branch 'maint'

* maint:
  maintcheck: fix some failures, extend some checks

13 years agomaintcheck: fix some failures, extend some checks
Stefano Lattarini [Thu, 2 Jun 2011 10:15:52 +0000 (12:15 +0200)]
maintcheck: fix some failures, extend some checks

* Makefile.am (sc_diff_automake_in_automake): Update, as we
now expect 9 lines, not 8, to be changed from `automake.in'
to `automake'.
(sc_diff_aclocal_in_aclocal): New maintainer check, similar to
the above, and checking that only 10 lines are changed from
`aclocal.in' to `aclocal'.
(syntax_check_rules): Update.
(sc_tests_Exit_not_exit): Exempt self tests `self-check-*.test'
from this check, as they can legitimately use the bare `exit'
builtin in various places.
* doc/automake.texi (Python): Remove stray `@' from the end of
a line.  Typo introduced in commit `v1.11-312-g5bf7af6'.
* tests/depcomp8a.test: Pass DISTCHECK_CONFIGURE_FLAGS to make
from the environment rather than from the command line, to
pacify the `sc_tests_overriding_macros_on_cmdline' maintainer
check.
* tests/depcomp8b.test: Likewise.

13 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 1 Jun 2011 17:37:18 +0000 (19:37 +0200)]
Merge branch 'maint'

* maint:
  remake: behave better with non-GNU make in subdirectories

13 years agoMerge branch 'remake-rules-non-GNU-make' into maint
Stefano Lattarini [Wed, 1 Jun 2011 16:58:35 +0000 (18:58 +0200)]
Merge branch 'remake-rules-non-GNU-make' into maint

13 years agoMerge branch 'maint'
Stefano Lattarini [Tue, 31 May 2011 16:03:48 +0000 (18:03 +0200)]
Merge branch 'maint'

* maint:
  automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
  build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
  tests/README: fix example about `make -e' usage

13 years agoautomake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
Stefano Lattarini [Sun, 29 May 2011 08:42:00 +0000 (10:42 +0200)]
automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE

Currently, the Automake's own configure script allow definition
of AUTOCONF and AUTOM4TE, expected to point respectively to an
autoconf and autom4te programs.  But while these definitions are
honoured in the Automake's build systems and test suite, they
were *not* honoured in the generated `automake' and `aclocal'
scripts.  This behaviour, apart from being wrong in that it does
not allow the user enough freedom in choosing his tools, also
caused inconsistencies in the test suite, brining to spurious
failures.

Problem reported by Graham Reitz on the automake list; see thread:
<http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html>

* automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'.
* aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'.
* Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and
`@am_AUTOM4TE'.
* NEWS: Update.
* THANKS: Update.

13 years agobuild: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
Stefano Lattarini [Sun, 29 May 2011 09:04:08 +0000 (11:04 +0200)]
build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too

Our build system allows the user to override AUTOCONF and AUTOHEADER
at configure time, and honours these overrides in our testsuite.
But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE.
This change fixes that inconsistency.

* configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New
AC_SUBSTitutions.  Update comments.
* tests/defs.in ($AUTOUPDATE): Default to `@am_AUTOUPDATE@' now.
($AUTOM4TE): New variable, defaulting to `@am_AUTOM4TE@'.
($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'.
* doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.

13 years agoremake: behave better with non-GNU make in subdirectories
Stefano Lattarini [Sun, 29 May 2011 13:24:58 +0000 (15:24 +0200)]
remake: behave better with non-GNU make in subdirectories

Currently, with every decent make program, it is possible to
rebuild out-of-date autotools-generated files with a simple
"make Makefile" -- but for this to work reliably with non-GNU
make implementations, the command must be issued from the
top-level directory.  This patch removes such limitation.

* lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'.
* tests/defs.in (using_gmake): New function, backported from the
`master' branch (and simplified).
* tests/remake-subdir.test: New test.
* tests/remake-subdir2.test: Likewise.
* tests/remake-subdir-gnu.test: Likewise.
* tests/remake-subdir-from-subdir.test: Likewise.
* tests/Makefile.am (TESTS): Update.

13 years agotestsuite: each test case depends on `defs-static'
Stefano Lattarini [Fri, 27 May 2011 08:20:25 +0000 (10:20 +0200)]
testsuite: each test case depends on `defs-static'

* tests/Makefile.am ($(TEST_LOGS)): Depends on `defs-static' too.
Simplify comments.

13 years agotests/README: fix example about `make -e' usage
Ralf Wildenhues [Sun, 22 May 2011 17:02:27 +0000 (19:02 +0200)]
tests/README: fix example about `make -e' usage

* tests/README (Section "Writing test cases" subsection "Do"): When
some variable is never initialized in the Makefile, `-e' is not
necessary in order to override it.  DESTDIR is such a variable: we
ensure that we do not ever initialize it.  And as such, it is quite
portable to use:
  $ make DESTDIR=/foo/bar install
and in fact, quite widely used.
So our example about when `make -e' is required, which references
the `DESTDIR' variable, is poorly chosen, if not downright wrong.
Rewrite it to use `prefix' as the overridden variable instead.

13 years agoparallel-tests: stricter checks on DISABLE_HARD_ERRORS support
Stefano Lattarini [Sun, 22 May 2011 07:35:17 +0000 (09:35 +0200)]
parallel-tests: stricter checks on DISABLE_HARD_ERRORS support

* tests/parallel-tests-harderror.test: New test, doing more
in-depth checks on DISABLE_HARD_ERRORS.
* tests/parallel-tests.test: Remove tests on DISABLE_HARD_ERRORS,
now redundant.
* tests/Makefile.am (TESTS): Update.

13 years agoMerge branch 'maint' into parallel-tests-maint
Stefano Lattarini [Fri, 20 May 2011 22:16:25 +0000 (00:16 +0200)]
Merge branch 'maint' into parallel-tests-maint

* maint:
  testsuite: avoid re-running few tests with 'parallel-tests' option
  testsuite: allow tests to avoid the use of 'parallel-tests' option
  tests/README: update obsoleted advice
  test defs: rename requirement 'non-cross' -> 'native'
  testsuite: be more cross-compile friendly

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 20 May 2011 21:33:09 +0000 (23:33 +0200)]
Merge branch 'maint'

* maint:
  testsuite: avoid re-running few tests with 'parallel-tests' option
  testsuite: allow tests to avoid the use of 'parallel-tests' option
  tests/README: update obsoleted advice

13 years agotestsuite: avoid re-running few tests with 'parallel-tests' option
Stefano Lattarini [Fri, 20 May 2011 21:18:39 +0000 (23:18 +0200)]
testsuite: avoid re-running few tests with 'parallel-tests' option

Some tests in our testsuite use the 'simple-tests' driver only
marginally, or simply as a mean to conveniently check unrelated
invariants.  It makes little sense to force these tests to also
run with the 'parallel-tests' Automake option active, as doing so
offers no real gain in coverage, while often causing a measurable
overhead in execution time (for an already too-slow testsuite).

* tests/pr401.test (parallel_tests): Define to "no", to prevent
the generation of a sibling test script using the 'parallel-tests'
driver.
* tests/pr401b.test: Likewise.
* tests/pr401c.test: Likewise.

13 years agotestsuite: allow tests to avoid the use of 'parallel-tests' option
Stefano Lattarini [Fri, 20 May 2011 20:31:40 +0000 (22:31 +0200)]
testsuite: allow tests to avoid the use of 'parallel-tests' option

* tests/gen-parallel-tests: Do not generate "siblings" for tests
that explicitly define the `parallel_tests', whether to "yes" or
to any other value.  Extend heading comments to give a rationale
for this behaviour.
* tests/README: Update.

13 years agotests/README: update obsoleted advice
Stefano Lattarini [Fri, 20 May 2011 20:15:32 +0000 (22:15 +0200)]
tests/README: update obsoleted advice

* tests/README (Section "Writing test cases" subsection "Do"):
Do not suggest to use the `*-p.test' pattern for the names of
hand-written tests which use the `parallel-tests' Automake option.
Not only is this not respected by the existing tests, but it is
more likely to cause conflicts with auto-generated tests.
So, suggest to *avoid* using the `*-p.test' pattern in names
of hand-written tests instead.
(Section "Writing test cases" subsection "Do not"):  When
suggesting not to override Makefile variables using command
line arguments, do not use the badly outdated variables `U'
and 'ANSI2KNR' in the example; instead, use the more common
and typical `DESTDIR'.

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 19 May 2011 19:53:02 +0000 (21:53 +0200)]
Merge branch 'maint'

* maint:
  test defs: rename requirement 'non-cross' -> 'native'

13 years agotest defs: rename requirement 'non-cross' -> 'native'
Stefano Lattarini [Thu, 19 May 2011 19:48:27 +0000 (21:48 +0200)]
test defs: rename requirement 'non-cross' -> 'native'

* tests/defs.in (non-cross): Rename requirement ...
(native): ... to this, which is clearer and fits the
existing lingo better.

Suggestion by Ralf Wildenhues.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 15 May 2011 13:35:27 +0000 (15:35 +0200)]
Merge branch 'maint'

* maint:
  testsuite: be more cross-compile friendly

13 years agotestsuite: be more cross-compile friendly
Stefano Lattarini [Sun, 15 May 2011 12:30:43 +0000 (14:30 +0200)]
testsuite: be more cross-compile friendly

* tests/defs.in (cross_compiling): New subroutine.
(am__tool_prefix): New internal variable.
(gcc, g++, gcj): Force the use of the correct "tool prefix"
when cross compiling.
(gfortran, g77, non-cross): New requirements.

13 years agoMerge branch 'test-repeated-options-portability-fix'
Stefano Lattarini [Sun, 15 May 2011 12:41:57 +0000 (14:41 +0200)]
Merge branch 'test-repeated-options-portability-fix'

13 years agotests: fix portability issues in 'repeated-options.test'
Stefano Lattarini [Sun, 15 May 2011 12:41:35 +0000 (14:41 +0200)]
tests: fix portability issues in 'repeated-options.test'

* tests/repeated-options.test: Do not assume that object files
have `.o' suffix and executables have no default suffix; instead,
use `$(OBJEXT)' and `$(EXEEXT)'.

13 years agodocs: parallel-tests is not experimental anymore
Stefano Lattarini [Wed, 11 May 2011 14:01:52 +0000 (16:01 +0200)]
docs: parallel-tests is not experimental anymore

The parallel-tests driver has now been used quite extensively
by a fair number of real-world applications (e.g., GNU coreutils,
GNU libtool, GNU grep, and various packages using Gnulib), and
thus exposed to adequate on-field testing.  So there's no point
in declaring it experimental anymore (which would risk to make
potential users shy away from it).

* doc/automake.texi (Simple Tests using parallel-tests): Do not
declare the parallel-tests driver as "experimental" anymore.

13 years agocheck: document and test $(TEST_SUITE_LOG) overriding
Stefano Lattarini [Thu, 21 Apr 2011 08:25:01 +0000 (10:25 +0200)]
check: document and test $(TEST_SUITE_LOG) overriding

* doc/automake.texi (Simple Tests using parallel-tests): Explain
how and why TEST_SUITE_LOG can be overridden at runtime.
* tests/parallel-tests-log-override-1.test: New test, check that
the newly documented idiom and similar usages are truly supported.
* tests/parallel-tests-log-override-2.test: Likewise.
* tests/parallel-tests-log-override-recheck.test: Likewise.
* tests/Makefile.am (TESTS): Update.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 7 May 2011 13:39:37 +0000 (15:39 +0200)]
Merge branch 'maint'

* maint:
  tests: fix spurious failure of txinfo21.test on FreeBSD

13 years agoMerge branch 'test-extradep-fix'
Stefano Lattarini [Sat, 7 May 2011 13:23:57 +0000 (15:23 +0200)]
Merge branch 'test-extradep-fix'

13 years agotypofix in ChangeLog
Stefano Lattarini [Sat, 7 May 2011 13:23:28 +0000 (15:23 +0200)]
typofix in ChangeLog

13 years agoMerge branch 'test-extradep-fix'
Stefano Lattarini [Sat, 7 May 2011 13:10:14 +0000 (15:10 +0200)]
Merge branch 'test-extradep-fix'

13 years agotests: fix spurious failure of extradep.test on FreeBSD
Stefano Lattarini [Sat, 7 May 2011 10:58:51 +0000 (12:58 +0200)]
tests: fix spurious failure of extradep.test on FreeBSD

* tests/extradep.test: When using `ls -t' to determine whether a
file has been updated, make sure to use as reference a file whose
timestamp is expected to be *strictly* older that that of the file
being checked.  This is required because at least FreeBSD `ls' do
not sort files with the same timestamp in alphabetical order when
using the `-t' option.
* tests/extradep2.test: Likewise.

13 years agotests: fix spurious failure of txinfo21.test on FreeBSD
Stefano Lattarini [Sat, 7 May 2011 12:34:39 +0000 (14:34 +0200)]
tests: fix spurious failure of txinfo21.test on FreeBSD

* tests/txinfo21.test: Use the `is_newest' subroutine instead of
the `ls -t' hack to to determine whether a file has been updated.
This is required because at least FreeBSD `ls' do not sort files
with the same timestamp in alphabetical order when using the `-t'
option.

13 years agoChangeLog: some typofixes
Stefano Lattarini [Wed, 4 May 2011 21:06:16 +0000 (23:06 +0200)]
ChangeLog: some typofixes

13 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 4 May 2011 20:50:59 +0000 (22:50 +0200)]
Merge branch 'maint'

13 years agoChangeLog: various typofixes (and related reformatting)
Stefano Lattarini [Wed, 4 May 2011 20:42:19 +0000 (22:42 +0200)]
ChangeLog: various typofixes (and related reformatting)