platform/upstream/automake.git
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 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)

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

With some edits to `tests/defs' and `ChangeLog', to reflect the
fact that in master we already had a `yacc' requirement, and no
more had an explicitly-recognized `bison' requirement.

13 years agotests defs: allow requirements for compilers (mostly dummy)
Stefano Lattarini [Wed, 4 May 2011 16:42:11 +0000 (18:42 +0200)]
tests defs: allow requirements for compilers (mostly dummy)

Most of the new requirements that are now accepted in `$required'
as consequence of this patch are still dummy.  They are planned
to be implemented only in master (or in some derived branch), but
having them here (even just as no-op) will allow for an easier
integration/backporting of potential new testcases.

* tests/defs.in (cc, c++, fortran, fortran77): New requirements,
still dummy.
(flex): New requirement, picking LEX for configure.
(lex): New requirement, alias for `flex'.  A more appropriate
implementation, looking for a generic `lex' program, will follow
in the future.
(yacc): New requirement, alias for `bison'.  A more appropriate
implementation, looking for a generic `yacc' program, will follow
in the future.

13 years agoMerge branch 'tests-man-fixes'
Stefano Lattarini [Tue, 3 May 2011 17:21:28 +0000 (19:21 +0200)]
Merge branch 'tests-man-fixes'

13 years agotests: add forgotten test scripts to $(TESTS)
Stefano Lattarini [Tue, 3 May 2011 17:19:13 +0000 (19:19 +0200)]
tests: add forgotten test scripts to $(TESTS)

* tests/Makefile.am (TESTS): Added test scripts  man[678].test,
which have been present on the filesystem and in the repository,
but which had erroneously been left out from $(TESTS).

13 years agotests: ensure verbose printing of captured make output
Stefano Lattarini [Tue, 3 May 2011 16:24:29 +0000 (18:24 +0200)]
tests: ensure verbose printing of captured make output

* tests/libtool7.test: Ensure verbose printing of captured
make output.
* tests/libtool9.test: Likewise.

13 years agotests: fix spurious failure in 'color2.test'
Stefano Lattarini [Mon, 2 May 2011 22:27:07 +0000 (00:27 +0200)]
tests: fix spurious failure in 'color2.test'

* tests/color2.test: If $MAKE contains command-line arguments (as
in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails
spuriously, because it tries to run "$MAKE" as a single command.
Fix this with proper uses of the TCL `eval' builtin.

13 years agotests: fix self check spurious failure with older bash versions
Stefano Lattarini [Sun, 1 May 2011 13:54:46 +0000 (15:54 +0200)]
tests: fix self check spurious failure with older bash versions

* tests/self-check-cleanup.test: Add trailing `:' to the test code
passed to $SHELL, otherwise older versions of bash (at least 2.05
and 3.2.39) fail to correctly remove the temporary directory in
the exit trap.

13 years agotestsuite: more environment sanitization
Stefano Lattarini [Fri, 29 Apr 2011 17:45:40 +0000 (19:45 +0200)]
testsuite: more environment sanitization

* tests/defs: Move the checks verifying that the variables `me',
`parallel_tests' and `required' aren't set in the environment ...
* tests/defs-static.in: ... in here, with some optimizations to
avoid useless forks.  Also, do the same checks for the variables
`original_AUTOMAKE' and `original_ACLOCAL' too.
* tests/self-check-env-sanitize.test: Update.
* tests/Makefile.am (TESTS_ENVIRONMENT): Unset also variables
`original_AUTOMAKE' and `original_ACLOCAL'.

13 years agoMerge branch 'am-tests-environment-fix-merge'
Stefano Lattarini [Sun, 24 Apr 2011 16:09:30 +0000 (18:09 +0200)]
Merge branch 'am-tests-environment-fix-merge'

13 years agotests: fix spurious failure (non-renamed AM_TESTS_SETUP usage)
Stefano Lattarini [Sun, 24 Apr 2011 16:08:44 +0000 (18:08 +0200)]
tests: fix spurious failure (non-renamed AM_TESTS_SETUP usage)

* tests/parallel-tests-reset-term.test: Use AM_TESTS_ENVIRONMENT
instead of AM_TESTS_SETUP (which has been removed in commit
v1.11-349-g12f48fa).

Fix spurious failure introduced by merge `v1.11-781-gfeed175'.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 24 Apr 2011 08:27:44 +0000 (10:27 +0200)]
Merge branch 'maint'

13 years agoMerge branch 'parallel-tests-testname-vpath-fix' into maint
Stefano Lattarini [Sun, 24 Apr 2011 08:26:58 +0000 (10:26 +0200)]
Merge branch 'parallel-tests-testname-vpath-fix' into maint

13 years agotests: fix spurious failure in a test on TESTS (VPATH-related)
Stefano Lattarini [Sun, 24 Apr 2011 08:22:05 +0000 (10:22 +0200)]
tests: fix spurious failure in a test on TESTS (VPATH-related)

* check-tests-in-builddir.test: When not using the parallel-tests
option, do not check that VPATH components are not present in the
displayed test name, since the simple-tests driver do not try to
strip them.

13 years agoMerge branch 'fix-env-selfcheck'
Stefano Lattarini [Sat, 23 Apr 2011 22:09:46 +0000 (00:09 +0200)]
Merge branch 'fix-env-selfcheck'

13 years agotests: fix spurious failure in self-check-env-sanitize.test
Stefano Lattarini [Sat, 23 Apr 2011 22:08:11 +0000 (00:08 +0200)]
tests: fix spurious failure in self-check-env-sanitize.test

* tests/self-check-env-sanitize.test: Open file descriptor `5'
to stdout.

Fix spurious failure introduced by merge `v1.11-788-g3b0c8d5'.

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

13 years agotest: self check subroutines for skipping/failing of tests
Stefano Lattarini [Sat, 23 Apr 2011 21:37:30 +0000 (23:37 +0200)]
test: self check subroutines for skipping/failing of tests

* tests/self-check-report.test: New test.
* tests/Makefile.am (TESTS): Update.

13 years agotest defs: new subroutines for test skipping/failing.
Jim Meyering [Sun, 16 Jan 2011 14:36:07 +0000 (15:36 +0100)]
test defs: new subroutines for test skipping/failing.

* tests/defs.in (Exit): Move definition of this function earlier.
(warn_, skip_, fail_, framework_failure_): New functions, inspired
to the homonyms in gnulib's tests/init.sh.
($stderr_fileno_): New global variable, used by the new functions
above.
* tests/README: Updated.

From a suggestion by Ralf Wildenhues.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 23 Apr 2011 09:22:40 +0000 (11:22 +0200)]
Merge branch 'maint'

13 years agotests: fix typo (copy & paste blunder) in heading comment
Stefano Lattarini [Sat, 23 Apr 2011 08:55:49 +0000 (10:55 +0200)]
tests: fix typo (copy & paste blunder) in heading comment

* tests/maintclean-vpath.test: Correctly refer to the sister test
as `maintclean.test', not as `maintclean-vpath.test'.

13 years agotests: remove redundant test `mclean.test'
Stefano Lattarini [Sat, 23 Apr 2011 08:48:34 +0000 (10:48 +0200)]
tests: remove redundant test `mclean.test'

* tests/mclean.test: Remove, it's a weak grepping test completely
superseded by the much more complete `maintclean.test'.
* tests/Makefile.am (TESTS): Update.

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 22 Apr 2011 22:02:23 +0000 (00:02 +0200)]
Merge branch 'maint'

13 years agotestsuite: more environment sanitization
Stefano Lattarini [Fri, 22 Apr 2011 21:50:03 +0000 (23:50 +0200)]
testsuite: more environment sanitization

* tests/defs.in: Sanity check: abort if any of `parallel_tests'
or `required' is in the environment.
($sed_unindent_prog): Initialize to empty, to avoid interferences
from the environment.
* tests/self-check-me-in-env.test: Renamed to ...
* tests/self-check-env-sanitize.test: ... this, and extended.
* tests/Makefile.am (TESTS): Update.
(TESTS_ENVIRONMENT): Unset variables `parallel_tests' and
`required'.  Adjust comments.

13 years agotests: in self-checks, use $SHELL, not /bin/sh
Stefano Lattarini [Tue, 19 Apr 2011 20:57:39 +0000 (22:57 +0200)]
tests: in self-checks, use $SHELL, not /bin/sh

* tests/self-check-me-in-env.test: Include `./defs-static' to get
the definition of `$SHELL'.  Use `$SHELL' instead of `/bin/sh' to
execute the tests.

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 agoMerge branch 'me-override-fix' into maint
Stefano Lattarini [Tue, 19 Apr 2011 20:39:14 +0000 (22:39 +0200)]
Merge branch 'me-override-fix' into maint

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'