platform/upstream/automake.git
13 years agotests: prefer AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT
Stefano Lattarini [Tue, 19 Apr 2011 20:52:54 +0000 (22:52 +0200)]
tests: prefer AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT

* tests/Makefile.am (TESTS_ENVIRONMENT): Renamed to ...
(AM_TESTS_ENVIRONMENT): ... this.

13 years agoMerge branch 'me-override-fix'
Stefano Lattarini [Tue, 19 Apr 2011 20:47:48 +0000 (22:47 +0200)]
Merge branch 'me-override-fix'

13 years agotests: don't allow `$me' to be overridden from the environment
Stefano Lattarini [Sun, 17 Apr 2011 22:29:19 +0000 (00:29 +0200)]
tests: don't allow `$me' to be overridden from the environment

* tests/defs.in: Sanity check: abort if $me is in the environment.
* tests/self-check-me-in-env.test: New test.
* tests/Makefile.am (TESTS_ENVIRONMENT): Unset variable `me'.
(TESTS): Update.

Suggestion by Ralf Wildenhues.

13 years agoMerge branch 'am-tests-environment'
Stefano Lattarini [Tue, 19 Apr 2011 07:46:53 +0000 (09:46 +0200)]
Merge branch 'am-tests-environment'

13 years agocheck: rename AM_TESTS_SETUP -> AM_TESTS_ENVIRONMENT
Stefano Lattarini [Sun, 17 Apr 2011 22:52:03 +0000 (00:52 +0200)]
check: rename AM_TESTS_SETUP -> AM_TESTS_ENVIRONMENT

The AM_TESTS_SETUP naming was not a good one after all.  It may
be technically more correct than AM_TESTS_ENVIRONMENT, but the
latter is a better one simply because it is easier to remember,
and even if you've never heard of it and only know the semantics
of TESTS_ENVIRONMENT, you can have a straightforward way to
figure out how AM_TESTS_ENVIRONMENT would work.

* tests/check.am (am__check_pre): Update.
* doc/automake.in (Simple Tests using parallel-tests): Update.
* tests/parallel-tests-am_tests_setup.test: Renamed ...
* tests/parallel-tests-am_tests_environment.test: ... to this,
and updated.
* tests/Makefile.am (TESTS): Update.

Suggestion and motivation by Ralf Wildenhues.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 17 Apr 2011 16:25:27 +0000 (18:25 +0200)]
Merge branch 'maint'

13 years agotest defs: allow overriding of `$me'
Stefano Lattarini [Sun, 17 Apr 2011 15:58:45 +0000 (17:58 +0200)]
test defs: allow overriding of `$me'

* tests/defs.in ($me): Allow overriding by the including test
script.  Add some explicative comments.

13 years agocoverage: more tests on the parallel-tests driver
Stefano Lattarini [Sun, 17 Apr 2011 15:28:04 +0000 (17:28 +0200)]
coverage: more tests on the parallel-tests driver

* tests/parallel-tests-interrupt.test: New test.
* tests/parallel-tests-reset-term.test: Likewise.
* tests/Makefile.am (TESTS): Update.

13 years agoMerge branch 'am-tests-setup'
Stefano Lattarini [Sun, 17 Apr 2011 13:21:34 +0000 (15:21 +0200)]
Merge branch 'am-tests-setup'

13 years agocheck: new developer-reserved AM_TESTS_SETUP variable
Stefano Lattarini [Mon, 24 Jan 2011 10:34:32 +0000 (11:34 +0100)]
check: new developer-reserved AM_TESTS_SETUP variable

For reference, see the discussion at:
<http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00213.html>

* lib/am/check.am [%?PARALLEL_TESTS%] (am__check_pre): Pass also
$(AM_TESTS_SETUP).  Comments updated, and some typos fixed.
* doc/automake.texi (Simple Tests using parallel-tests): Document
AM_TESTS_SETUP.  Reorder some of the existing documentation a bit.
* tests/parallel-tests-am_tests_setup.test: New test.

From a suggestion by Ralf Wildenhues.

13 years agoMerge branch 'tests-depcomp-extend' into maint
Stefano Lattarini [Sun, 17 Apr 2011 12:53:00 +0000 (14:53 +0200)]
Merge branch 'tests-depcomp-extend' into maint

13 years agodepcomp tests: don't reject slower dependency extractors
Stefano Lattarini [Sun, 17 Apr 2011 11:43:16 +0000 (13:43 +0200)]
depcomp tests: don't reject slower dependency extractors

* tests/depcomp8b.test: Add the `--enable-dependency-tracking'
option to the ./configure invocation, so that slower dependency
extractors are not rejects.
* tests/depcomp8b.test: Likewise.  Also ...
(foo.c): ... since we are at it, fix spacing to be consistent
with GNU coding standards.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 17 Apr 2011 10:00:29 +0000 (12:00 +0200)]
Merge branch 'maint'

The following additional changes has been made:
* m4/amversion.in: Bump serial number from `1' to `8', to avoid
potential future conflicts with branch-1.11.
* m4/amversion.m4: Likewise.
* m4/gcj.m4: Likewise.
* m4/python.m4: Likewise.
* m4/install-sh.m4: Likewise.

13 years agom4: add missing serial numbers to a few files
Stefano Lattarini [Sun, 17 Apr 2011 09:21:49 +0000 (11:21 +0200)]
m4: add missing serial numbers to a few files

Related to automake bug#8483.

* m4/amversion.in: Add serial number.
* m4/auxdir.m4: Likewise.
* m4/gcj.m4: Likewise.
* m4/install-sh.m4: Likewise.
* m4/mkdirp.m4: Likewise.
* m4/python.m4: Likewise.
* m4/runlog.m4: Likewise.
* m4/strip.m4: Likewise.
* m4/upc.m4: Likewise.

13 years agoMerge branch 'self-check-fix'
Stefano Lattarini [Sat, 16 Apr 2011 12:37:03 +0000 (14:37 +0200)]
Merge branch 'self-check-fix'

13 years agotests: fix few bugs in self checks
Stefano Lattarini [Sat, 16 Apr 2011 12:32:29 +0000 (14:32 +0200)]
tests: fix few bugs in self checks

Related to automake bug#8508.

* tests/self-check-cleanup.test: Be laxer when grepping output
from `ls -l', to account for ACLs and SELinux-only files.
* tests/self-check-dir.test: Source `defs-static' to read in the
correct definition for $SHELL.
* tests/self-check-me.test: Likewise, and extend a bit.

Report from Jim Meyering.

13 years agoMerge branch 'maint'
Ralf Wildenhues [Sat, 16 Apr 2011 10:50:09 +0000 (12:50 +0200)]
Merge branch 'maint'

13 years agoMerge branch 'fix-depcomp' into maint
Ralf Wildenhues [Sat, 16 Apr 2011 10:49:35 +0000 (12:49 +0200)]
Merge branch 'fix-depcomp' into maint

* fix-depcomp:
  depcomp: correct invalid sed invocation

13 years agodepcomp: correct invalid sed invocation
Jim Meyering [Sat, 16 Apr 2011 09:55:46 +0000 (11:55 +0200)]
depcomp: correct invalid sed invocation

* lib/depcomp: Insert missing -e before '/:$/d'.
Otherwise, that use of sed would treat '/:$/d' as a file name.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 15 Apr 2011 18:09:54 +0000 (20:09 +0200)]
Merge branch 'maint'

13 years agoMerge branch 'maintcheck-pathsep-fix' into maint
Stefano Lattarini [Fri, 15 Apr 2011 18:09:32 +0000 (20:09 +0200)]
Merge branch 'maintcheck-pathsep-fix' into maint

13 years agomaintainer check: quote literal `$' in Makefile rule
Stefano Lattarini [Fri, 15 Apr 2011 18:01:58 +0000 (20:01 +0200)]
maintainer check: quote literal `$' in Makefile rule

* Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$'
character in double-quoted string.  Fix a bug in which the rule
emitted an erroneously empty substring in its error message.

13 years agoMerge branch 'fix-python5b-test'
Stefano Lattarini [Fri, 15 Apr 2011 17:21:26 +0000 (19:21 +0200)]
Merge branch 'fix-python5b-test'

13 years agotests: fix typo in python5b.test
Stefano Lattarini [Fri, 15 Apr 2011 17:15:48 +0000 (19:15 +0200)]
tests: fix typo in python5b.test

* tests/python5b.test: Remove extra `:' from $PATH redefinition.

13 years agotests: remove redundant settings of `errexit' shell flag
Stefano Lattarini [Fri, 15 Apr 2011 16:41:06 +0000 (18:41 +0200)]
tests: remove redundant settings of `errexit' shell flag

* tests/autodist-acconfig.test: Do not set the `errexit'
shell flag, as it is already set by `tests/defs'.
* 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/autodist-subdir.test: Likewise.
* tests/autodist.test: Likewise.
* tests/check-exported-srcdir.test: Likewise.
* tests/check-tests-in-builddir.test: Likewise.
* tests/check-tests_environment.test: Likewise.
* tests/help-python.test: Likewise.
* tests/java-check.test: Likewise.
* tests/java-extra.test: Likewise.
* tests/java-noinst.test: Likewise.
* tests/lex-subobj-nodep.test: Likewise.
* tests/ltinit.test: Likewise.
* tests/m4-inclusion.test: Likewise.
* tests/maintclean-vpath.test: Likewise.
* tests/parallel-tests-subdir.test: Likewise.
* tests/pr8365-remake-timing.test: Likewise.
* tests/python-dist.test: Likewise.
* tests/python-vars.test: Likewise.
* tests/python-virtualenv.test: Likewise.
* tests/python5b.test: Likewise.
* tests/specflg-dummy.test: Likewise.
* tests/yacc-dist-nobuild-subdir.test: Likewise.

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 15 Apr 2011 15:08:06 +0000 (17:08 +0200)]
Merge branch 'maint'

13 years agoMerge branch 'expose-bug-8485' into maint
Stefano Lattarini [Fri, 15 Apr 2011 14:23:03 +0000 (16:23 +0200)]
Merge branch 'expose-bug-8485' into maint

13 years agocoverage: test for automake bug#8485 (known regression)
Stefano Lattarini [Tue, 12 Apr 2011 13:11:04 +0000 (15:11 +0200)]
coverage: test for automake bug#8485 (known regression)

* tests/yacc-dist-nobuild-subdir.test: New test.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Update.

Cherry-picked from 7ad822a39190682bc159c2f9c21c25a4273d037c.

13 years agoMerge branch 'maint' (with edits)
Stefano Lattarini [Tue, 12 Apr 2011 15:25:42 +0000 (17:25 +0200)]
Merge branch 'maint' (with edits)

test defs: define default $distdir (help reducing duplication)

* tests/defs ($distdir): New variable, might be used in
testcases checking distribution-related features.
* tests/pr9.test: Use it.
* tests/subdir9.test: Likewise.
* tests/lex3.test: Likewise.
* tests/lexvpath.test: Likewise.
* tests/remake-moved-m4-file.test: Likewise.
* tests/remake-renamed-m4-file.test: Likewise.
* tests/remake-renamed-m4-macro-and-file.test: Likewise.
* tests/yacc-basic.test: Likewise.
* tests/yacc-d-basic.test: Likewise.
* tests/yacc-d-vpath.test: Likewise.
* tests/yacc-dist-nobuild.test: Likewise.
* tests/vtexi3.test: Add comment explaining why we redefine
$distdir in this test.

13 years agotest defs: define default $distdir (help reducing duplication)
Stefano Lattarini [Tue, 12 Apr 2011 14:50:33 +0000 (16:50 +0200)]
test defs: define default $distdir (help reducing duplication)

* tests/defs.in ($distdir): New variable, might be used in
testcases checking distribution-related features.
* tests/pr9.test: Use it.
* tests/subdir9.test: Likewise.
* tests/vtexi3.test: Add comment explaining why we redefine
$distdir in this test.

13 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 11 Apr 2011 15:08:01 +0000 (17:08 +0200)]
Merge branch 'maint'

13 years agoMerge branch 'fix-depcomp'
Stefano Lattarini [Mon, 11 Apr 2011 15:07:47 +0000 (17:07 +0200)]
Merge branch 'fix-depcomp'

13 years agoMerge branch 'fix-depcomp' into maint
Stefano Lattarini [Mon, 11 Apr 2011 15:06:05 +0000 (17:06 +0200)]
Merge branch 'fix-depcomp' into maint

13 years agodepcomp: fix bugs in tests and in the depcomp script
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.

13 years agoMerge branch 'maint'
Ralf Wildenhues [Mon, 11 Apr 2011 05:09:50 +0000 (07:09 +0200)]
Merge branch 'maint'

13 years agoFix hp depmode for VPATH builds with GNU make.
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>
13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 10 Apr 2011 13:37:23 +0000 (15:37 +0200)]
Merge branch 'maint'

13 years agotest defs: fix 'javac' requirement for older JDK versions
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 10 Apr 2011 07:50:49 +0000 (09:50 +0200)]
Merge branch 'maint'

test defs: new requirement for the default java compiler

* tests/defs (for tool in $required): New requirement 'javac'.
* tests/java.test: Use it instead of ad-hoc configure check.
* tests/java-check.test: Likewise.
* tests/java-extra.test: Likewise.
* tests/java-noinst.test: Likewise.
* tests/instfail-java.test: Likewise.
* tests/instdir-java.test: Likewise.

13 years agotest defs: new requirement for the default java compiler
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 9 Apr 2011 21:27:48 +0000 (23:27 +0200)]
Merge branch 'maint'

13 years agocoverage: add tests on remake rules in more complex situations
Stefano Lattarini [Wed, 6 Apr 2011 12:45:40 +0000 (14:45 +0200)]
coverage: add tests on remake rules in more complex situations

* tests/defs (using_gmake): New function.
(for tool in $required): Use it when $tool is 'GNUmake'.
* tests/remake-moved-m4-file.test: New test.
* tests/remake-deleted-m4-file.test: Likewise.
* tests/remake-renamed-m4-file.test: Likewise.
* tests/remake-renamed-m4-macro-and-file.test: Likewise.
* tests/remake-renamed-m4-macro.test: Likewise.
* tests/remake-add-acsubst-gnulib.test: Likewise.
* tests/remake-add-header-gnulib.test: Likewise.
* tests/remake-remove-header-gnulib.test: Likewise.
* tests/Makefile.am (TESTS): Update.

13 years agojava: check_JAVA does not cause compilation by "make all" anymore
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.

13 years agotypofix in 'tests/defs'
Stefano Lattarini [Sat, 9 Apr 2011 19:41:03 +0000 (21:41 +0200)]
typofix in 'tests/defs'

* tests/defs: Fix typo (`itslef' instead of `itself') in
comments.

13 years agoMerge branch 'java-coverage'
Stefano Lattarini [Sat, 9 Apr 2011 12:19:00 +0000 (14:19 +0200)]
Merge branch 'java-coverage'

13 years agocoverage: more on java support: EXTRA_ and noinst_ prefixes
Stefano Lattarini [Wed, 6 Apr 2011 18:41:04 +0000 (20:41 +0200)]
coverage: more on java support: EXTRA_ and noinst_ prefixes

* tests/java-extra.test: New test, checking support for the
prefix `EXTRA_' with the JAVA primary.
* tests/java-noinst.test: New test, checking support for the
prefix `noinst_' with the JAVA primary.
* tests/Makefile.am (TESTS): Update.

13 years agoMerge branch 'maint'
Ralf Wildenhues [Sat, 9 Apr 2011 10:39:44 +0000 (12:39 +0200)]
Merge branch 'maint'

13 years agoClarify regex code in depcomp.
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>
13 years agoFix makedepend depmode for VPATH builds.
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>
13 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 2 Apr 2011 14:00:23 +0000 (16:00 +0200)]
Merge branch 'maint'

13 years agotests: fix timestamp-related failures
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.

13 years agoCreate subdirs for generated sources even when not dep tracking.
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>
13 years agoMerge branch 'fix-check-exported-srcdir.test' into maint
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.

13 years agoFix 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>
13 years agodocs: better visibility for aclocal in the index
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.

13 years agotests: improve tests on "maintainer-clean" target
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.

13 years agoMerge branch 'maint'
Ralf Wildenhues [Mon, 21 Mar 2011 21:18:42 +0000 (22:18 +0100)]
Merge branch 'maint'

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

13 years agotests: 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>
13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 17 Mar 2011 22:31:48 +0000 (23:31 +0100)]
Merge branch 'maint'

13 years agocosmetics: better use of m4 quoting and m4sugar macros
Stefano Lattarini [Tue, 15 Mar 2011 16:36:40 +0000 (17:36 +0100)]
cosmetics: better use of m4 quoting and m4sugar macros

* m4/dmalloc.m4: Better use of m4 quoting.  Bump serial number.
* m4/gcj.m4: Likewise.
* m4/init.m4: Likewise.
* m4/install-sh.m4: Likewise.
* m4/lex.m4: Likewise.
* m4/multi.m4: Likewise.
* m4/option.m4: Likewise.
* m4/python.m4: Likewise.
* m4/sanity.m4: Likewise.
* m4/cond.m4: Likewise.  Also, prefer the m4sugar macro 'm4_if'
over the plain m4 macro 'ifelse'.
* m4/depend.m4: Likewise.

13 years agotests: add test about deprecated use of AC_INIT
Stefano Lattarini [Thu, 17 Mar 2011 22:18:36 +0000 (23:18 +0100)]
tests: add test about deprecated use of AC_INIT

* tests/deprecated-acinit.test: New test, check that automake
and autoconf complain about an old-style AC_INIT call used with
a new-style AM_AUTOMAKE_INIT call.
* tests/Makefile.am (TESTS): Update.

13 years agomaintcheck: look for problematic names of testcases
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.

13 years agotests: fix bug in alloca*.test
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 4 Mar 2011 18:10:00 +0000 (19:10 +0100)]
Merge branch 'maint'

13 years agoMerge branch 'tests-texinfo' into maint
Stefano Lattarini [Fri, 4 Mar 2011 18:09:54 +0000 (19:09 +0100)]
Merge branch 'tests-texinfo' into maint

13 years agotests: fix bug (comments-in-var-defn.test + autoconf 2.62)
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.

13 years agocosmetics: convert encoding from ISO-8859 to UTF-8
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.

13 years agotests: extend checks on then 'unindent' shell function
Stefano Lattarini [Tue, 1 Mar 2011 09:38:53 +0000 (10:38 +0100)]
tests: extend checks on then 'unindent' shell function

* tests/self-check-unindent.test: Also check that multiple
instances of 'unindent' can run in parallel (this was not
the case when that function used temporary files).

13 years agoMerge branch 'maint'
Stefano Lattarini [Tue, 1 Mar 2011 09:25:26 +0000 (10:25 +0100)]
Merge branch 'maint'

13 years agotest defs: unindent without temporary file
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>
13 years agolibtool: suggest LT_INIT if LTLIBRARIES primary is used
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.

13 years agotests: add testcases sanity-checking the testsuite
Stefano Lattarini [Mon, 21 Feb 2011 13:57:24 +0000 (14:57 +0100)]
tests: add testcases sanity-checking the testsuite

Helper subroutines, variables and other pieces of code defined
in the `tests/defs' and used by many testcases are non-obvious,
and tricky to get to work portably; but until now, they weren't
tested at all in a clear and self-contained way.
This change should remedy to the situation.

* tests/self-check-cleanup.test: New test, check removal of
temporary test working directory by `./defs'.
* tests/self-check-dir.test: New test, check that tests using
`./defs' create a proper temporary directory, and run in it.
* tests/self-check-exit.test: New test, check that, in case of
failing commands, the correct exit status is passed to the exit
trap installed by the `./defs' script.
* tests/self-check-is_newest.test: New test, checking the
`is_newest' subroutine.
* tests/self-check-me.test: New test, checking that $me gets
defined automatically by `tests/defs' if not set, and that it
can be overridden from either the shell or the environment.
* tests/self-check-sanity.test: New test, check that the sanity
checks performed by the `tests/defs' script works correctly.
* tests/self-check-unindent.test: New test, checking the
`unindent' subroutine.
* tests/Makefile.am (TESTS): Update.

13 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 23 Feb 2011 20:38:04 +0000 (21:38 +0100)]
Merge branch 'maint'

13 years agotests: tempdirs with restrictive permissions are cleaned correctly
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 16 Feb 2011 12:00:59 +0000 (13:00 +0100)]
Merge branch 'maint'

13 years agotest defs: add subroutine for input unindenting
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Tue, 15 Feb 2011 09:17:53 +0000 (10:17 +0100)]
Merge branch 'maint'

13 years agopython: report the 'PYTHON' influential environment variable
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.

13 years agotests: `instspc-*.test': do not create useless source file
Stefano Lattarini [Sun, 14 Nov 2010 17:10:37 +0000 (18:10 +0100)]
tests: `instspc-*.test': do not create useless source file

* tests/instspc-tests.sh (create_input_data): Do not create
unused source file `source2.c'.

13 years agotests: optimize `instspc-*.test' for speed
Stefano Lattarini [Fri, 5 Nov 2010 14:51:56 +0000 (15:51 +0100)]
tests: optimize `instspc-*.test' for speed

After the split of `instspc.test' into various generated tests,
the running time of the testsuite has noticeably increased, since
all these new generated tests must run aclocal, autoconf and
automake, whereas previously they were run only once (at the
beginning of `instspc.test').  But luckily, since the new tests
share the same input files for the autotools, this situation can
be easily worked around (at the expenses of a slight increase of
complexity for the testsuite scaffolding).

* tests/instspc-data.test: New helper test, properly calling
the `instspc-tests.sh' script to generate input data for the
others `instspc-*.test' tests.
* tests/Makefile.am (TESTS): Add `instspc-data.test'.
($(instspc_tests:.test=.log)): Depend on its log file.
(instspc-data.log): Depend on `instspc-tests.sh'.
* tests/instspc-tests.sh: Recognize new action `generate-data',
and use it to create hand-written and autotools-generated static
files shared by all the `instspc-*.test' tests.
When sourced by the `instspc-*.test' tests, use those previously
created files instead of recreating them from scratch.
(unindent, create_input_data): New subroutines.
Some other related changes and refactorings.

From a suggestion by Ralf Wildenhues.

13 years agoMerge branch 'python-tests-extend'
Stefano Lattarini [Mon, 14 Feb 2011 23:47:52 +0000 (00:47 +0100)]
Merge branch 'python-tests-extend'

13 years agopython: fix spurious failure in tests
Stefano Lattarini [Sun, 13 Feb 2011 10:40:16 +0000 (11:40 +0100)]
python: fix spurious failure in tests

* tests/python-vars.test: Ignore cached values from config.site
by exporting CONFIG_SITE=/dev/null.  Be laxer in matching the
expected values of output variables `pythondir' and `pyexecdir',
since they can change quite unpredictably among different python
installations.  Also, avoid "hyping" debugging output, thus
offering smaller trace output and more informative diff.
* tests/python-virtualenv.test: Require python, since we call it
even after the virtualenv has been deactivated.  Ignore cached
values from config.site by exporting CONFIG_SITE=/dev/null.

Report and suggestions by Ralf Wildenhues.

13 years agotests defs: clear TESTS_ENVIRONMENT variable
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 10 Feb 2011 09:32:51 +0000 (10:32 +0100)]
Merge branch 'maint'

13 years agoMerge branch 'python-tests-extend'
Stefano Lattarini [Thu, 10 Feb 2011 09:13:59 +0000 (10:13 +0100)]
Merge branch 'python-tests-extend'

Conflicts:
tests/Makefile.am
tests/Makefile.in
tests/python11.test
tests/python2.test
tests/python8.test
tests/python9.test

13 years agotests: tweak few tests on simple and parallel test drivers
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.

13 years agopython: extend and improve tests, fix minor glitches
Stefano Lattarini [Tue, 1 Feb 2011 22:22:08 +0000 (23:22 +0100)]
python: extend and improve tests, fix minor glitches

* m4/python.m4 (AM_PATH_PYTHON): Ensure the "checking ..." messages
from configure are always complete, even in case of failure.  Tiny
cosmetic improvement in info/error messages.
* tests/python.test: Also check that automake complains if the
PYTHON primary is used but the `py-compile' script is not present.
Make grepping of generated Makefile.in laxer w.r.t. whitespace.
Add trailing `:' command.
* tests/python2.test: Remove repeated calls aclocal: they are
useless because configure.in is never modified.  Make grepping
of automake stderr more comprehensive.  Remove the pre-existing
`py-compile' file before trying to install it with `--add-missing'.
Add trailing `:' command.
* tests/python3.test: Add trailing `:' command.
* tests/python11.test: Likewise.
* tests/python4.test: Likewise.  Also, try to pass PYTHON config
variable to configure from the environment, rather than only from
the command line.
* tests/python5.test: Ensure that the "checking ..." messages from
configure are always complete.  Use proper m4 quoting.  Add a
trailing `:' command.
* tests/python6.test: Simplify test logic, by checking for files
created by configure rather then grepping its output.
* tests/python7.test: Likewise.
* tests/python8.test: Also check that `$PYTHON' is meaningfully
set in the ACTION-IF-TRUE argument of AM_PATH_PYTHON.
* tests/python9.test: Likewise.
* tests/python10.test: Add trailing `:' command.
(Makefile.am): Declare `disttest' target as `.PHONY', and add
an `ls -l' to its recipe, for debugging.
* tests/nobase-python.test: In testing "make uninstall" and
"make install" results, prefer idioms that make verbose logs
more helpful.  Remove a couple of lines of dead code.  Add a
trailing `:' command.
* tests/python5b.test: New test, checking that configure performs
the check on the python version even when the choice of the python
interpreter is forced by the user.
* tests/python-dist.test: New test, checking the distribution of
*_PYTHON files.
* tests/python-vars.test: New test, checking that AM_PATH_PYTHON
correctly set all the output variables advertised in the manual.
* tests/python-virtualenv.test: New test, checking that python
support offered by automake works well with "virtual python
environments" created by the `virtualenv' program.
* tests/instdir-prog.test: Also check `$(pyexecdir)'.  Existing
checks made slightly stricter.
* tests/instdir-prog.test: Also check `$(pyexecdir)'.  Existing
* tests/instdir-ltlib.test: Likewise.
* tests/Makefile.am (TESTS): Update.

13 years agocoverage: more tests on simple and parallel test drivers
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.

13 years agoMerge branch 'lflags-test-fixes' into maint
Stefano Lattarini [Sat, 29 Jan 2011 17:47:39 +0000 (18:47 +0100)]
Merge branch 'lflags-test-fixes' into maint

13 years agotests: fix spurious failures in lflags*.test
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.

13 years agodocs: color-tests issues with parallel make
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.

13 years agoMerge branch 'maint'
Ralf Wildenhues [Mon, 24 Jan 2011 20:43:41 +0000 (21:43 +0100)]
Merge branch 'maint'

13 years agotests: avoid instspc.test failures due to make's whitespace trimming
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>
13 years agocoverage: test semantics of "dummy" per-target flags
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.

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

13 years agotests: avoid instspc* failures due to make's whitespace trimming
Ralf Wildenhues [Sun, 23 Jan 2011 09:57:21 +0000 (10:57 +0100)]
tests: avoid instspc* failures due to make's whitespace trimming

* tests/instspc-tests.sh: 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 and Tru64/OSF make.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
13 years agoMerge branch 'maint'
Ralf Wildenhues [Sat, 22 Jan 2011 17:31:12 +0000 (18:31 +0100)]
Merge branch 'maint'

13 years agoMerge branch 'tests-suffix-extend'
Ralf Wildenhues [Sat, 22 Jan 2011 17:27:30 +0000 (18:27 +0100)]
Merge branch 'tests-suffix-extend'

* tests-suffix-extend:
  tests: fix VPATH auto-expansion workarounds.
  tests: fix VPATH auto-expansion workarounds.

13 years agotests: fix VPATH auto-expansion workarounds.
Ralf Wildenhues [Sat, 22 Jan 2011 12:11:39 +0000 (13:11 +0100)]
tests: fix VPATH auto-expansion workarounds.

* tests/suffix10.test, tests/suffix11.test, tests/suffix12.test,
tests/suffix3.test, tests/suffix5.test, tests/suffix8.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>