Stefano Lattarini [Thu, 6 Oct 2011 16:56:16 +0000 (18:56 +0200)]
tests: fix spurious error in 'test-extensions.test'
* tests/test-extensions.test: Call automake with the option
`--add-missing', to ensure the required script `test-driver'
gets installed. Note that the test still fails due to an
internal error in automake, though.
Stefano Lattarini [Thu, 6 Oct 2011 12:29:31 +0000 (14:29 +0200)]
Merge branch 'master' into test-protocols
Stefano Lattarini [Thu, 6 Oct 2011 11:56:49 +0000 (13:56 +0200)]
Merge branch 'maint'
* maint:
fix: make a test script executable
coverage: expose automake bug#9651
parallel-tests: automake error our on invalid TEST_EXTENSIONS
fix: regenerate Makefile
docs: don't suggest installing `.m4' files in hard-coded location
distuninstallcheck: fail also when only one file is left installed
Stefano Lattarini [Thu, 6 Oct 2011 11:42:11 +0000 (13:42 +0200)]
fix: make a test script executable
* tests/nobase-nodist.test: Make executable.
Stefano Lattarini [Thu, 6 Oct 2011 11:26:58 +0000 (13:26 +0200)]
coverage: expose automake bug#9651
* tests/dist-auxfile.test: New test, xfailing.
* tests/dist-auxfile-2.test: Likewise.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Add them.
Stefano Lattarini [Thu, 6 Oct 2011 08:45:25 +0000 (10:45 +0200)]
Merge branch 'fix-pr9400' into maint
* fix-pr9400:
parallel-tests: automake error our on invalid TEST_EXTENSIONS
Stefano Lattarini [Sat, 1 Oct 2011 19:31:07 +0000 (21:31 +0200)]
parallel-tests: automake error our on invalid TEST_EXTENSIONS
This change fixes automake bug#9400.
* automake.in (handle_tests): Bail out if a suffix specified in
TEST_EXTENSIONS would produce an invalid `xxx_LOG_COMPILER'
variable or an invalid suffix rule. Before this change, automake
would have issued a confusing error messages (about invalid or
non-POSIX variables being defined), and in some situations would
have even produced a broken `Makefile.in' file.
($TEST_EXTENSION_PATTERN): New helper variable.
* doc/automake.texi (Simple Tests using parallel-tests): Document
the limitations on TEST_EXTENSIONS explicitly.
* NEWS: Update.
* tests/test-extensions.test: New test.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Sat, 1 Oct 2011 17:31:22 +0000 (19:31 +0200)]
fix: regenerate Makefile
Stefano Lattarini [Sat, 1 Oct 2011 17:28:24 +0000 (19:28 +0200)]
Merge branch 'fix-pr7988' into maint
* fix-pr7988:
docs: don't suggest installing `.m4' files in hard-coded location
Stefano Lattarini [Sat, 1 Oct 2011 17:22:37 +0000 (19:22 +0200)]
Merge branch 'fix-pr9579' into maint
* fix-pr9579:
distuninstallcheck: fail also when only one file is left installed
Stefano Lattarini [Wed, 28 Sep 2011 18:48:13 +0000 (20:48 +0200)]
tap/awk: improve comments about Korn shell signal handling issues
* lib/tap-driver.sh: Link an Austin Group discussion about how
shells are allowed, and even encouraged, to set the special
variable `$?' to values greater than 256 to report termination
of a child by a signal. Improve and extend comments about our
workarounds for unusual korn shell signals' propagation.
Thanks to Eric Blake for the pointers.
Stefano Lattarini [Wed, 28 Sep 2011 14:59:47 +0000 (16:59 +0200)]
Merge branch 'master' into test-protocols
* master:
fix: regenerate Makefile.in files
maintcheck: fix usage of `cd' instead of `$(am__cd)'
Stefano Lattarini [Wed, 28 Sep 2011 14:58:52 +0000 (16:58 +0200)]
Merge branch 'maint'
* maint:
fix: regenerate Makefile.in files
maintcheck: fix usage of `cd' instead of `$(am__cd)'
Stefano Lattarini [Wed, 28 Sep 2011 14:49:35 +0000 (16:49 +0200)]
Merge branch 'fix-pr9578' into maint
* fix-pr9578:
fix: regenerate Makefile.in files
Stefano Lattarini [Wed, 28 Sep 2011 14:46:58 +0000 (16:46 +0200)]
fix: regenerate Makefile.in files
Stefano Lattarini [Wed, 28 Sep 2011 14:31:24 +0000 (16:31 +0200)]
tap/awk: account for unusual korn shell signal handling behaviour
This change has been motivated by a testsuite failure on Debian
with the AT&T Korn Shell version 93u-1.
* lib/tap-driver.sh: Temporarily ignore some common signals when
waiting for the test command to complete, to avoid premature exit
in Korn shells that propagate to themselves signals that have
killed a child process.
See also related commit `v1.11-1342-g6321ad3'.
Stefano Lattarini [Wed, 28 Sep 2011 14:05:06 +0000 (16:05 +0200)]
tap/awk: handle exit statuses > 256 (seen on few korn shells)
Some Korn shells, when a child process die due to signal number
n, can leave in $? an exit status of 256+n instead of the more
standard 128+n. Apparently, both behaviours are allowed by
POSIX, so be prepared to handle them both.
This change has been motivated by a testsuite failure on Debian
with the AT&T Korn Shell version 93u-1.
* lib/tap-driver.sh (get_test_exit_message): Handle the described
Korn Shell behaviour too.
($scriptversion): Update.
Stefano Lattarini [Wed, 28 Sep 2011 11:21:11 +0000 (13:21 +0200)]
Merge branch 'fix-pr9578' into maint
* fix-pr9578:
maintcheck: fix usage of `cd' instead of `$(am__cd)'
Stefano Lattarini [Wed, 28 Sep 2011 11:17:13 +0000 (13:17 +0200)]
maintcheck: fix usage of `cd' instead of `$(am__cd)'
* lib/am/inst-vars.am (am__uninstall_files_from_dir): Use
`$(am__cd)', not plain `cd'.
Stefano Lattarini [Sun, 25 Sep 2011 12:29:19 +0000 (14:29 +0200)]
docs: don't suggest installing `.m4' files in hard-coded location
This change fixes automake bug#7988.
* doc/automake.texi (aclocal Options): State that the use of
the `--print-ac-dir' option to determine the directory where
third-party packages can install their `.m4' files is discouraged
now.
(Extending aclocal): Suggest telling the user about ACLOCAL_PATH.
* THANKS: Update.
Report by Peter Johansson.
Stefano Lattarini [Wed, 28 Sep 2011 09:17:33 +0000 (11:17 +0200)]
Merge branch 'master' into test-protocols
* master:
uninstall: "make uninstall" before "make install" works
tests: fix tests on aclocal search path precedences
Stefano Lattarini [Wed, 28 Sep 2011 09:11:51 +0000 (11:11 +0200)]
Merge branch 'maint'
* maint:
uninstall: "make uninstall" before "make install" works
Stefano Lattarini [Fri, 23 Sep 2011 14:06:59 +0000 (16:06 +0200)]
distuninstallcheck: fail also when only one file is left installed
This change fixes automake bug#9579.
* lib/am/distdir.am (distuninstallcheck): Be stricter in ignoring
a potential `dir' file created by install-info and left installed.
Also, be more careful about "this can't happen" kind of errors.
(am__distuninstallcheck_listfiles): New internal helper macro.
* tests/distcheck-pr9579.test: New test.
* tests/distcheck-override-infodir.test: Likewise.
* tests/Makefile.am (TESTS): Add them.
* NEWS, THANKS: Update.
Report by Nick Bowler.
Stefano Lattarini [Mon, 26 Sep 2011 19:50:37 +0000 (21:50 +0200)]
Merge branch 'fix-pr9578' into maint
* fix-pr9578:
uninstall: "make uninstall" before "make install" works
Stefano Lattarini [Fri, 23 Sep 2011 20:50:14 +0000 (22:50 +0200)]
uninstall: "make uninstall" before "make install" works
This change fixes automake bug#9578.
* lib/am/inst-vars.am (am__uninstall_files_from_dir): New internal
macro, that defines a shell code fragment to uninstall files from
a given directory.
* lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use it, to reduce code
duplication and improve consistency and correctness.
* lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
* lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
* lib/am/mans.am (uninstall-man%SECTION%): Likewise.
* lib/am/python.am (uninstall-%DIR%LIBRARIES): Likewise.
* lib/am/scripts.am (uninstall-%DIR%SCRIPTS): Likewise.
* tests/uninstall-pr9578.test: New test.
* tests/uninstall-fail.test: New test.
* tests/Makefile.am (TESTS): Add them.
* NEWS, THANKS: Update.
Report by Nick Bowler.
Stefano Lattarini [Thu, 22 Sep 2011 14:40:40 +0000 (16:40 +0200)]
Merge branch 'maint'
* maint:
tests: fix tests on aclocal search path precedences
Stefano Lattarini [Thu, 22 Sep 2011 14:40:32 +0000 (16:40 +0200)]
Merge branch 'aclocal-path' into maint
* aclocal-path:
tests: fix tests on aclocal search path precedences
Stefano Lattarini [Thu, 22 Sep 2011 14:40:03 +0000 (16:40 +0200)]
tests: fix tests on aclocal search path precedences
* tests/aclocal-path-precedence.test: Call `$ACLOCAL' with the
proper overridden system acdir.
Stefano Lattarini [Tue, 20 Sep 2011 18:47:41 +0000 (20:47 +0200)]
Merge branch 'master' into test-protocols
* master:
docs: remove mention of deprecated option `--acdir'
fix: cleanup NEWS after botched merges
fix: typo in NEWS
docs: document planned precedence changes in aclocal search path
aclocal: handle ACLOCAL_PATH environment variable
tests: fix spurious failure in 'primary-prefix-valid-couples.test'
docs: deprecate JAVA primary
docs: clearer distinction between `.java' with javac and with gcj
java: complain if java_JAVA is used but $(javadir) is undefined
Stefano Lattarini [Tue, 20 Sep 2011 18:39:04 +0000 (20:39 +0200)]
docs: remove mention of deprecated option `--acdir'
* doc/automake.texi (aclocal Options): Remove mention of
deprecated `--acdir' option.
Stefano Lattarini [Tue, 20 Sep 2011 18:27:23 +0000 (20:27 +0200)]
fix: cleanup NEWS after botched merges
Stefano Lattarini [Tue, 20 Sep 2011 18:21:06 +0000 (20:21 +0200)]
Merge branch 'maint'
* maint:
fix: typo in NEWS
Stefano Lattarini [Tue, 20 Sep 2011 18:20:53 +0000 (20:20 +0200)]
fix: typo in NEWS
Stefano Lattarini [Tue, 20 Sep 2011 18:16:43 +0000 (20:16 +0200)]
Merge branch 'maint'
* maint:
docs: document planned precedence changes in aclocal search path
aclocal: handle ACLOCAL_PATH environment variable
tests: fix spurious failure in 'primary-prefix-valid-couples.test'
docs: deprecate JAVA primary
docs: clearer distinction between `.java' with javac and with gcj
java: complain if java_JAVA is used but $(javadir) is undefined
Stefano Lattarini [Tue, 20 Sep 2011 18:15:55 +0000 (20:15 +0200)]
Merge branch 'aclocal-path' into maint
* aclocal-path:
docs: document planned precedence changes in aclocal search path
aclocal: handle ACLOCAL_PATH environment variable
Stefano Lattarini [Tue, 20 Sep 2011 15:42:01 +0000 (17:42 +0200)]
docs: document planned precedence changes in aclocal search path
* doc/automake.texi (Macro Search Path): Explicitly state that the
lookup order for extra directories of `.m4' files will be changed
in the next major release.
* NEWS: Likewise.
Paolo Bonzini [Tue, 9 Nov 2010 19:14:38 +0000 (20:14 +0100)]
aclocal: handle ACLOCAL_PATH environment variable
* aclocal.in (parse_ACLOCAL_PATH): New function, parse ACLOCAL_PATH
as a colon-separated list of directories to be included in the
search path.
* doc/automake.texi (Macro Search Path): Document new behavior and
the precedence rules for various elements of the search path.
* tests/aclocal-path.test: New test.
* tests/aclocal-path-install.test: Likewise.
* tests/aclocal-path-install-serial.test: Likewise.
* tests/aclocal-path-precedence.test: Likewise.
* tests/aclocal-path-nonexistent.test: Likewise.
* tests/Makefile.am (TESTS): Add them.
* NEWS: Update.
* tests/distcheck-missing-m4.test: Extend by also checking
interactions with ACLOCAL_PATH.
* tests/distcheck-outdated-m4.test: Likewise, and fix a couple
of botched comments since we are at it.
Stefano Lattarini [Mon, 19 Sep 2011 16:24:44 +0000 (18:24 +0200)]
Merge branch 'fix-java-prefix-is-unexpected' into maint
Stefano Lattarini [Mon, 19 Sep 2011 16:21:25 +0000 (18:21 +0200)]
tests: fix spurious failure in 'primary-prefix-valid-couples.test'
* tests/primary-prefix-valid-couples.test: After commit
v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
combination by default anymore: one has to explicitly define
$(javadir) to make it so. So just drop `java_JAVA' from our
Makefile.am Also, since we are at it, ...
(configure.in): ... remove AM_PROG_GCJ from here, as it's not
really required.
Stefano Lattarini [Mon, 19 Sep 2011 11:30:30 +0000 (13:30 +0200)]
Merge branch 'deprecate-java-primary' into maint
Stefano Lattarini [Mon, 19 Sep 2011 09:28:42 +0000 (11:28 +0200)]
docs: deprecate JAVA primary
* doc/automake.texi (Java): Deprecate the JAVA primary, stating
that it will become obsolete in automake 1.12 and probably removed
altogether in automake 1.13. Reflect this in the section title,
by appending the string "(deprecated feature)".
(@menu, @detailmenu): Update.
(Java Support with gcj): The cross-referenced support for bytecode
compilation with the JAVA primary is rudimentary and deprecated.
State that explicitly.
Stefano Lattarini [Mon, 19 Sep 2011 09:16:12 +0000 (11:16 +0200)]
docs: clearer distinction between `.java' with javac and with gcj
* doc/automake.texi (Java support): Rename this node ...
(Java support with gcj): ... to this, and change its title from
"Compiling Java sources" to "Compiling Java sources using gcj".
(@detailmenu, @menu, @cindex): Update and make more precise.
(Java): Change the title of this node from simply "Java" to
"Java bytecode compilation".
(@detailmenu, @menu, @cindex): Update and make more precise.
Stefano Lattarini [Sun, 18 Sep 2011 21:32:38 +0000 (23:32 +0200)]
java: complain if java_JAVA is used but $(javadir) is undefined
Fixes automake bug#8461.
* automake.in (handle_java): Remove inappropriate "java" argument
from the calls to `&am_install_var' and `&am_primary_prefixes'.
* tests/instdir-java.test (Makefile.am): Define `$(javadir)'.
* tests/javadir-undefined.test: New test.
* tests/Makefile.am (TESTS): Add it.
* NEWS: Update.
Stefano Lattarini [Sun, 18 Sep 2011 18:42:56 +0000 (20:42 +0200)]
parallel-tests: expose automake bug#9546
* tests/test-driver-is-distributed.test: New test.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Add it.
Stefano Lattarini [Sun, 18 Sep 2011 16:32:12 +0000 (18:32 +0200)]
Merge branch 'master' into test-protocols
Stefano Lattarini [Sun, 18 Sep 2011 16:21:29 +0000 (18:21 +0200)]
Merge branch 'remove-deansification'
* remove-deansification:
automake: remove special handling of `ANSI2KNR' make variable
Stefano Lattarini [Sun, 18 Sep 2011 16:13:59 +0000 (18:13 +0200)]
Merge branch 'maint'
* maint:
coverage: test interactions of `nobase_' and `nodist_'
cosmetics: fix various typos and grammaros
py-compile: '--' and non-option arguments terminate the option list
py-compile: complain on unrecognized options
py-compile: normalize error and help messages
python tests: add "unit tests" on py-compile
py-compile: the '--destdir' option now accepts a blank argument
python: run the 'py-compile' script with $(SHELL)
Stefano Lattarini [Sun, 18 Sep 2011 16:05:43 +0000 (18:05 +0200)]
Merge branch 'python-work' into maint
* python-work:
cosmetics: fix various typos and grammaros
py-compile: '--' and non-option arguments terminate the option list
py-compile: complain on unrecognized options
py-compile: normalize error and help messages
python tests: add "unit tests" on py-compile
py-compile: the '--destdir' option now accepts a blank argument
python: run the 'py-compile' script with $(SHELL)
Stefano Lattarini [Sun, 18 Sep 2011 15:51:31 +0000 (17:51 +0200)]
coverage: test interactions of `nobase_' and `nodist_'
* tests/nobase-nodist.test: New test.
* tests/Makefile.am (TESTS): Add it.
Stefano Lattarini [Sun, 18 Sep 2011 15:36:05 +0000 (17:36 +0200)]
Merge branch 'maint'
* maint:
java: fix various blunders in test 'java-mix.test'
Stefano Lattarini [Sun, 18 Sep 2011 15:32:50 +0000 (17:32 +0200)]
java: fix various blunders in test 'java-mix.test'
* tests/java-mix.test: Add missing call to `set -e'. Fix inverted
semantics (`.java' files are expected *not* to be distributed by
default, not the other way round). Fix various typos in the name
of the `.java' files. Correct other minor blunders. Improve some
comments.
Stefano Lattarini [Sun, 18 Sep 2011 14:32:46 +0000 (16:32 +0200)]
Merge branch 'java-work'
* java-work:
fix: remove duplicated ChangeLog entries
java: allow both JAVA and nobase_JAVA in the same Makefile.am
java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
fix: regenerate tests/Makefile.in
tests defs: use `skip_' for skipping java-related tests
java tests: use $PATH_SEPARATOR where appropriate
java coverage: test JAVACFLAGS and AM_JAVACFLAGS
java coverage: test rebuild rules for java
java coverage: try to build and run a java program
test defs: new requirement for the default java interpreter
java tests: tweak and make stricter a couple of tests
java coverage: add test on uninstall with JAVA primary
java tests: require java compiler more properly
java: allow both JAVA and nobase_JAVA in the same Makefile.am
java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
Stefano Lattarini [Sun, 18 Sep 2011 14:24:04 +0000 (16:24 +0200)]
fix: remove duplicated ChangeLog entries
Stefano Lattarini [Sun, 18 Sep 2011 14:21:04 +0000 (16:21 +0200)]
Merge branch 'maint' into java-work
Stefano Lattarini [Sun, 18 Sep 2011 14:19:25 +0000 (16:19 +0200)]
Merge branch 'java-fixes-for-maint' into maint
Stefano Lattarini [Fri, 16 Sep 2011 11:41:42 +0000 (13:41 +0200)]
automake: remove special handling of `ANSI2KNR' make variable
* automake.in (define_configure_variable): Remove special-cased
handling of `ANSI2KNR' variable. Related minor simplifications.
Stefano Lattarini [Wed, 14 Sep 2011 12:58:05 +0000 (14:58 +0200)]
automake: remove code duplication in 'handle_tests'
* automake.in (handle_tests): Factor out some code dealing with
test extensions and rules for generation of `.log' files into ...
(handle_per_suffix_test): ... this new subroutine.
* tests/parallel-tests-exeext.test: New test.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Mon, 12 Sep 2011 16:37:05 +0000 (18:37 +0200)]
cosmetics: fix various typos and grammaros
* NEWS: Fix typos.
* tests/py-compile-basic.test: Likewise.
* tests/py-compile-basedir.test: Fix botched wording in comments.
* tests/py-compile-option-terminate.test: Fix typo and incomplete
comment.
Suggestions by Peter Rosin.
Stefano Lattarini [Mon, 12 Sep 2011 09:03:32 +0000 (11:03 +0200)]
java: allow both JAVA and nobase_JAVA in the same Makefile.am
* automake.in (handle_java): Also strip `nobase_' from the given
prefix, when needed.
* tests/java-clean.test: Update and extend.
* tests/java-compile-install.test: Likewise.
* tests/java-no-duplicate.test: Likewise.
* tests/java-sources.test: Likewise.
* tests/java-noinst.test: Likewise.
* tests/java-mix-dist-nodist.test: Renamed to ...
* tests/java-mix.test: ... this, and extended.
* tests/java-nobase.test: New test, still xfailing due to
unrelated issues.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
Cherry-picked from v1.11-356-g01dede4
Stefano Lattarini [Mon, 12 Sep 2011 08:54:49 +0000 (10:54 +0200)]
java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
Fixes automake bug#8434.
* automake.in (handle_java): Strip `dist_' and `nodist_' from
the given prefix. Define a new internal Makefile variable
`am__java_sources'. Related adjustments.
* lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the
first time this am file is processed.
(class%DIR%.stamp): Stamp file renamed ...
(class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_'
prefixes are stripped from the name of the stampfile. Adjust
declaration of dependencies by using the new automake-generated
internal variable `$(am__java_sources)'. In the rule, use `$@'
as the name of the target, rather than hard-coding it.
* tests/java.test: Update and extend.
* tests/java-no-duplicate.test: New test.
* tests/java-mix-dist-nodist.test: Likewise.
* tests/java-compile-and-install.test: Likewise.
* tests/java-clean.test: Likewise.
* tests/java-sources.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Cherry-picked from commit v1.11-337-gd76b503.
Stefano Lattarini [Sat, 10 Sep 2011 22:47:24 +0000 (00:47 +0200)]
Merge branch 'maint' into java-work
* maint:
tests: fix spurious failure on fast machines
aclocal: better URL reference in error message
coverage: distcheck-hook to catch missing/outdated *.m4 files
aclocal: more granularity in acdir overriding
Stefano Lattarini [Sat, 10 Sep 2011 22:47:09 +0000 (00:47 +0200)]
Merge branch 'maint' into python-work
* maint:
tests: fix spurious failure on fast machines
aclocal: better URL reference in error message
coverage: distcheck-hook to catch missing/outdated *.m4 files
aclocal: more granularity in acdir overriding
* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
fix: list test 'vala-vpath.test' in XFAIL_TESTS
tests: simplify wrapper for aclocal
fix: minor typo in ChangeLog
coverage: vala support failing for VPATH from-scratch builds
docs: report few more automake parsing limitations
tests: list "forgotten" test script in TESTS
ylwrap: fix unusual indentation whitespace
Stefano Lattarini [Sat, 10 Sep 2011 22:45:20 +0000 (00:45 +0200)]
Merge branch 'master' into test-protocols
* master:
tests: fix spurious failure on fast machines
aclocal: better URL reference in error message
Stefano Lattarini [Sat, 10 Sep 2011 22:44:12 +0000 (00:44 +0200)]
Merge branch 'maint'
* maint:
tests: fix spurious failure on fast machines
Stefano Lattarini [Sat, 10 Sep 2011 22:42:53 +0000 (00:42 +0200)]
tests: fix spurious failure on fast machines
* tests/aclocal-acdir.test: Avoid spurious failures due to caching
issues, by cleaning the autom4te cache between all the aclocal
invocations, and by always calling autoconf with the `--force'
flag.
Stefano Lattarini [Sat, 10 Sep 2011 21:25:13 +0000 (23:25 +0200)]
Merge branch 'maint'
* maint:
aclocal: better URL reference in error message
Stefano Lattarini [Sat, 10 Sep 2011 21:16:50 +0000 (23:16 +0200)]
aclocal: better URL reference in error message
* aclocal.in (scan_file): In the error message about underquoted
definitions, reference the automake page at `www.gnu.org', not
at `sources.redhat.com'.
Stefano Lattarini [Fri, 9 Sep 2011 09:54:22 +0000 (11:54 +0200)]
Merge branch 'master' into test-protocols
* master:
coverage: distcheck-hook to catch missing/outdated *.m4 files
Stefano Lattarini [Fri, 9 Sep 2011 09:41:42 +0000 (11:41 +0200)]
Merge branch 'maint'
* maint:
coverage: distcheck-hook to catch missing/outdated *.m4 files
Stefano Lattarini [Thu, 1 Sep 2011 15:42:41 +0000 (17:42 +0200)]
coverage: distcheck-hook to catch missing/outdated *.m4 files
Related to automake bug#9037.
* tests/distcheck-missing-m4.test: New test.
* tests/distcheck-outdated-m4.test: Likewise.
* tests/distcheck-hook-m4.am: New data file, used by the new
tests.
* tests/Makefile.am (distcheck-m4-missing.log,
distcheck-m4-outdated.log): Depend on it.
(EXTRA_DIST): Distribute it.
(TESTS): Add the new tests.
Stefano Lattarini [Thu, 8 Sep 2011 15:52:22 +0000 (17:52 +0200)]
Merge branch 'master' into test-protocols
* master:
aclocal: more granularity in acdir overriding
Stefano Lattarini [Thu, 8 Sep 2011 15:12:38 +0000 (17:12 +0200)]
Merge branch 'maint'
* maint:
aclocal: more granularity in acdir overriding
Stefano Lattarini [Mon, 5 Sep 2011 15:37:44 +0000 (17:37 +0200)]
aclocal: more granularity in acdir overriding
Before this change, using the `--acdir' option caused aclocal to
redefine both the directory of automake-provided m4 macros and the
directory of third-party system-wide m4 macros. With this change,
we deprecate the `--acdir' aclocal option, and introduce two new
options `--automake-acdir' and `--system-acdir', to allow for more
granularity.
* aclocal.in (@automake_includes, @system_includes,
@user_includes): Fix and extend comments.
(usage): Update.
(handle_acdir_option): New function.
(parse_arguments): Recognize new options `--system-acdir' and
`automake-acdir', and handle `--acdir' using the new function
above. Simplify logic by assuming that the directory of
third-party system-wide m4 files always exists.
* tests/aclocal.in: Update to use the new options, instead of
the deprecated. `--acdir'.
* m4/dirlist: Move ...
* m4/acdir/dirlist: ... here.
* m4/Makefile.am (EXTRA_DIST): Update.
(m4datadir): Rename ...
(automake_acdir): ... to this. Accordingly, ...
(dist_m4data_DATA): ... rename this ...
(dist_automake_ac_DATA): ... to this.
(system_acdir): New, directory.
(dist_system_ac_DATA): New, defined to an empty value; this will
ensure that the $(system_acdir) directory will be created by
"make install".
* tests/aclocal.test: Remove check about the `--print-ac-dir'
option of aclocal, it has been moved into ...
* tests/aclocal-print-acdir.test: ... this new test, and quite
extended.
* tests/aclocal-acdir.test: New test.
* tests/Makefile.am (TESTS): Add the new tests.
* NEWS, bootstrap: Update.
* doc/automake.texi (aclocal Options, Macro Search Path): Update.
Stefano Lattarini [Wed, 7 Sep 2011 15:41:40 +0000 (17:41 +0200)]
tap/perl: be more portable to older perl versions
* lib/tap-driver.pl (trap_perl_warnings_and_errors): Do not use
the three-args version of the `open' builtin, it is not well
supported by older perl versions (at least perl 5.6.2).
(start): Add a no-op statement to pacify a "possible typo ... used
only once" perl warning.
Stefano Lattarini [Wed, 7 Sep 2011 15:31:23 +0000 (17:31 +0200)]
tap/perl: be more portable to older TAP::Parser versions
* lib/tap-driver.pl (start): Do not call the `ignore_exit' method
on our TAP parser: it is not supported in older TAP::Parser
versions (e.g., 3.10), and is not really required by our usage of
the parser object.
Stefano Lattarini [Tue, 6 Sep 2011 21:54:49 +0000 (23:54 +0200)]
Merge branch 'maint' into java-work
* maint:
* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
fix: list test 'vala-vpath.test' in XFAIL_TESTS
tests: simplify wrapper for aclocal
fix: minor typo in ChangeLog
coverage: vala support failing for VPATH from-scratch builds
docs: report few more automake parsing limitations
Stefano Lattarini [Tue, 6 Sep 2011 15:37:32 +0000 (17:37 +0200)]
Merge branch 'master' into test-protocols
* master:
tests: fix spurious failures due to ignored signals
Stefano Lattarini [Tue, 6 Sep 2011 15:10:21 +0000 (17:10 +0200)]
tests: fix spurious failures due to ignored signals
* tests/defs (is_blocked_signal): New function.
* tests/parallel-tests-interrupt.test: Do not try to use/trap
signals that are ignored by the parent shell: they will be
ignored by all the child processes too.
* tests/self-check-exit.test: Likewise.
* tests/self-check-cleanup.test: Likewise, and do few minor
improvements and extensions since we are at it.
Stefano Lattarini [Tue, 6 Sep 2011 09:02:38 +0000 (11:02 +0200)]
Merge branch 'master' into test-protocols
* master:
* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
fix: list test 'vala-vpath.test' in XFAIL_TESTS
tests: simplify wrapper for aclocal
fix: minor typo in ChangeLog
automake: fix regression due to de-ansification support removal
coverage: vala support failing for VPATH from-scratch builds
docs: report few more automake parsing limitations
automake: cleanups after de-ansification support removal (2)
automake: cleanups after de-ansification support removal (1)
ansi: remove obsolete code/files for de-ANSI-fication support
ansi: reject attempts to use automatic de-ANSI-fication support
tests: remove tests about obsolete de-ANSI-fication support
docs: remove description of de-ANSI-fication support from manual
Stefano Lattarini [Tue, 6 Sep 2011 08:59:38 +0000 (10:59 +0200)]
Merge branch 'maint'
* maint:
* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
fix: list test 'vala-vpath.test' in XFAIL_TESTS
Peter Rosin [Mon, 5 Sep 2011 09:30:17 +0000 (11:30 +0200)]
* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Stefano Lattarini [Sun, 4 Sep 2011 15:28:49 +0000 (17:28 +0200)]
Merge branch 'fix-vala-vpath-test' into maint
Stefano Lattarini [Sun, 4 Sep 2011 15:28:35 +0000 (17:28 +0200)]
fix: list test 'vala-vpath.test' in XFAIL_TESTS
* tests/Makefile.am (XFAIL_TESTS): Update.
Stefano Lattarini [Fri, 2 Sep 2011 19:57:03 +0000 (21:57 +0200)]
Merge branch 'maint'
* maint:
tests: simplify wrapper for aclocal
Stefano Lattarini [Fri, 2 Sep 2011 18:16:58 +0000 (20:16 +0200)]
tests: simplify wrapper for aclocal
* tests/aclocal.in: Remove use of $ACLOCAL_TESTSUITE_FLAGS and
extra `-I' flags; they are not really required, since the file
`m4/amversion.m4' is generated in the srcdir anyway.
* tests/acloca10.test: Remove use of $ACLOCAL_TESTSUITE_FLAGS.
* tests/acloca18.test: Likewise.
* tests/defs.in: Don't nullify $ACLOCAL_TESTSUITE_FLAGS, and do
not export it.
Stefano Lattarini [Fri, 2 Sep 2011 15:39:53 +0000 (17:39 +0200)]
Merge branch 'maint'
Stefano Lattarini [Fri, 2 Sep 2011 15:39:35 +0000 (17:39 +0200)]
fix: minor typo in ChangeLog
Stefano Lattarini [Fri, 2 Sep 2011 08:31:19 +0000 (10:31 +0200)]
Merge branch 'remove-deansification'
* remove-deansification:
automake: fix regression due to de-ansification support removal
automake: cleanups after de-ansification support removal (2)
automake: cleanups after de-ansification support removal (1)
ansi: remove obsolete code/files for de-ANSI-fication support
ansi: reject attempts to use automatic de-ANSI-fication support
tests: remove tests about obsolete de-ANSI-fication support
docs: remove description of de-ANSI-fication support from manual
Stefano Lattarini [Thu, 1 Sep 2011 09:02:04 +0000 (11:02 +0200)]
automake: fix regression due to de-ansification support removal
The last change `v1.11-947-g136b489' removed code that automake
was using to decide whether binary objects were built by the
generated Makefile.in, so that it could avoid to emit unneeded
code when this was not the case. Re-introduce such code in a
less-obfuscated form, and add a test to ensure we don't regress
again.
* automake.in ($must_handle_compiled_objects): New global
variable, telling whether the generated Makefile has to build
compiled objects.
(initialize_per_input): Reset it.
(handle_programs, handle_libraries, handle_ltlibraries): Set
it to a true value when required.
(handle_compile): Don't generate any code if the variable
`$must_handle_compiled_objects' is not set to a true value.
* tests/no-extra-makefile-code.test: New test.
* tests/Makefile.am (TESTS): Add it.
Stefano Lattarini [Fri, 2 Sep 2011 08:04:43 +0000 (10:04 +0200)]
Merge branch 'maint'
* maint:
coverage: vala support failing for VPATH from-scratch builds
docs: report few more automake parsing limitations
Stefano Lattarini [Fri, 2 Sep 2011 07:56:20 +0000 (09:56 +0200)]
coverage: vala support failing for VPATH from-scratch builds
* tests/vala-vpath.test: New test, xfailing.
* tests/Makefile.am (TESTS): Update.
* THANKS: Update.
From a report by Zbigniew Jędrzejewski-Szmek.
Related to automake bug#8753.
Stefano Lattarini [Thu, 1 Sep 2011 17:17:39 +0000 (19:17 +0200)]
docs: report few more automake parsing limitations
Partly motivated by automake bug#8360.
* doc/automake.texi (General Operation): Report few more automake
limitations w.r.t. parsing of unusual makefile constructs. Related
minor reorderings.
* tests/doc-parsing-buglets-colneq-subst.test: New test.
* tests/doc-parsing-buglets-tabs.test: Likewise.
* tests/Makefile.am (TESTS): Update.
Stefano Lattarini [Sun, 28 Aug 2011 20:38:50 +0000 (22:38 +0200)]
automake: cleanups after de-ansification support removal (2)
* automake.in ($get_object_extension_was_run): Remove, it's not
really needed anymore.
(&get_object_extension): Remove, it's a no-op now.
All callers adjusted.
Stefano Lattarini [Sun, 28 Aug 2011 19:11:07 +0000 (21:11 +0200)]
automake: cleanups after de-ansification support removal (1)
* automake.in (lang_c_rewrite, handle_single_transform): Rename
variable `$nonansi_obj' to `$obj'.
Stefano Lattarini [Sun, 28 Aug 2011 14:09:50 +0000 (16:09 +0200)]
ansi: remove obsolete code/files for de-ANSI-fication support
* lib/ansi2knr.1, lib/ansi2knr.c: Deleted.
* lib/Makefile.am (dist_pkgvdata_DATA): Do not list them anymore.
* lib/am/ansi2knr.am: Delete.
* lib/am/Makefile.am (dist_am_DATA): Do not list it anymore.
* lib/Automake/Variable.pm (%_am_macro_for_var): Remove entries for
`ANSI2KNR' and `U'.
* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Don't care anymore
about possible definition of the `$U' variable.
* automake.in (@common_files): Drop `ansi2knr.1' and `ansi2knr.c'.
(struct): Remove scalar field `ansi'.
All callers adjusted.
(&lang_c_finish, %de_ansi_files): Remove, they're not required
anymore.
All callers adjusted.
($get_object_extension_was_run): Fix typo in comment.
(&get_object_extension): Drop code dealing with de-ansification;
this function basically a no-op now, but is required to properly
initialize `$get_object_extension_was_run' variable.
(&handle_languages, &handle_compile, &lang_c_rewrite): Drop code
dealing with de-ansification.
Stefano Lattarini [Mon, 29 Aug 2011 13:36:14 +0000 (15:36 +0200)]
tests: prefer AM_... variables to user-reserved ones in Makefile
* tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ...
(AM_TAP_LOG_DRIVER_FLAGS): ... to this.
Stefano Lattarini [Mon, 29 Aug 2011 13:27:08 +0000 (15:27 +0200)]
tests: some minor fixlets w.r.t. TAP-based tests
The variable that is used by our test scripts to decide whether
they are "plain" or TAP-based is `using_tap'; however, some
peripheral sanity checks and sanitization code in our testsuite
were erroneously using the `use_tap' variable instead. Fix that.
* tests/Makefile.am (AM_TESTS_ENVIRONMENT): Nullify `using_tap',
not `use_tap'.
* tests/defs-static.in: Check that `using_tap', not `use_tap',
is not exported.
* tests/self-check-env-sanitize.test: Update.
Stefano Lattarini [Mon, 29 Aug 2011 13:16:21 +0000 (15:16 +0200)]
tests: avoid re-running a test with the 'parallel-tests' option
* tests/backcompat5.test (parallel_tests): Define to "no", to
prevent the generation of a sibling test script that uses the
'parallel-tests' driver. That would be useless anyway, since
we manually override the contents of configure.in, thus clobbering
the `parallel-tests' option in AM_INIT_AUTOMAKE.
Fix a typo in comments since we are at it.
Stefano Lattarini [Sun, 28 Aug 2011 22:01:54 +0000 (00:01 +0200)]
tests: defaults to awk+shell driver in tests on TAP support
* tests/defs ($am_tap_implementation): Default to "shell", not
to "perl".
Stefano Lattarini [Sun, 28 Aug 2011 13:52:11 +0000 (15:52 +0200)]
ansi: reject attempts to use automatic de-ANSI-fication support
* tests/protos.m4 (AM_C_PROTOTYPES): Error out whenever called.
* lib/Automake/Options.pm (_process_option_list ): Error out
with a proper error message when the `ansi2knr' option is used.
Related updates to comments.
* tests/depacl2.test: Update.
* tests/ansi2knr-no-more.test: New test.
* tests/Makefile.am (TESTS): Add it.
* NEWS: Update.