]> git.ipfire.org Git - thirdparty/automake.git/log
thirdparty/automake.git
13 years agoMerge branch 'master' into test-protocols
Stefano Lattarini [Sun, 18 Sep 2011 16:32:12 +0000 (18:32 +0200)] 
Merge branch 'master' into test-protocols

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

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

13 years agoMerge branch 'python-work' into maint
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)

13 years agocoverage: test interactions of `nobase_' and `nodist_'
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.

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

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

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

13 years agofix: remove duplicated ChangeLog entries
Stefano Lattarini [Sun, 18 Sep 2011 14:24:04 +0000 (16:24 +0200)] 
fix: remove duplicated ChangeLog entries

13 years agoMerge branch 'maint' into java-work
Stefano Lattarini [Sun, 18 Sep 2011 14:21:04 +0000 (16:21 +0200)] 
Merge branch 'maint' into java-work

13 years agoMerge branch 'java-fixes-for-maint' into maint
Stefano Lattarini [Sun, 18 Sep 2011 14:19:25 +0000 (16:19 +0200)] 
Merge branch 'java-fixes-for-maint' into maint

13 years agoautomake: remove special handling of `ANSI2KNR' make variable
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.

13 years agoautomake: remove code duplication in 'handle_tests'
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.

13 years agocosmetics: fix various typos and grammaros
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.

13 years agojava: allow both JAVA and nobase_JAVA in the same Makefile.am
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

13 years agojava: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
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.

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

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

13 years agoMerge branch 'master' into test-protocols
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

13 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 10 Sep 2011 22:44:12 +0000 (00:44 +0200)] 
Merge branch 'maint'

* maint:
  tests: fix spurious failure on fast machines

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

13 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 10 Sep 2011 21:25:13 +0000 (23:25 +0200)] 
Merge branch 'maint'

* maint:
  aclocal: better URL reference in error message

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

13 years agoMerge branch 'master' into test-protocols
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

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

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

13 years agoMerge branch 'master' into test-protocols
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

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 8 Sep 2011 15:12:38 +0000 (17:12 +0200)] 
Merge branch 'maint'

* maint:
  aclocal: more granularity in acdir overriding

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

13 years agotap/perl: be more portable to older perl versions
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.

13 years agotap/perl: be more portable to older TAP::Parser versions
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.

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

13 years agoMerge branch 'master' into test-protocols
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

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

13 years agoMerge branch 'master' into test-protocols
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

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

13 years ago* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
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>
13 years agoMerge branch 'fix-vala-vpath-test' into maint
Stefano Lattarini [Sun, 4 Sep 2011 15:28:49 +0000 (17:28 +0200)] 
Merge branch 'fix-vala-vpath-test' into maint

13 years agofix: list test 'vala-vpath.test' in XFAIL_TESTS
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.

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 2 Sep 2011 19:57:03 +0000 (21:57 +0200)] 
Merge branch 'maint'

* maint:
  tests: simplify wrapper for aclocal

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

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 2 Sep 2011 15:39:53 +0000 (17:39 +0200)] 
Merge branch 'maint'

13 years agofix: minor typo in ChangeLog
Stefano Lattarini [Fri, 2 Sep 2011 15:39:35 +0000 (17:39 +0200)] 
fix: minor typo in ChangeLog

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

13 years agoautomake: fix regression due to de-ansification support removal
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.

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

13 years agocoverage: vala support failing for VPATH from-scratch builds
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.

13 years agodocs: report few more automake parsing limitations
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.

13 years agoautomake: cleanups after de-ansification support removal (2)
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.

13 years agoautomake: cleanups after de-ansification support removal (1)
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'.

13 years agoansi: remove obsolete code/files for de-ANSI-fication support
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.

13 years agotests: prefer AM_... variables to user-reserved ones in Makefile
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.

13 years agotests: some minor fixlets w.r.t. TAP-based tests
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.

13 years agotests: avoid re-running a test with the 'parallel-tests' option
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.

13 years agotests: defaults to awk+shell driver in tests on TAP support
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".

13 years agoansi: reject attempts to use automatic de-ANSI-fication support
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.

13 years agotests: remove tests about obsolete de-ANSI-fication support
Stefano Lattarini [Sun, 28 Aug 2011 13:12:17 +0000 (15:12 +0200)] 
tests: remove tests about obsolete de-ANSI-fication support

* tests/ansi.test: Delete.
* tests/ansi10.test: Likewise.
* tests/ansi2.test: Likewise.
* tests/ansi2knr-deprecation.test: Likewise.
* tests/ansi3.test: Likewise.
* tests/ansi3b.test: Likewise.
* tests/ansi4.test: Likewise.
* tests/ansi5.test: Likewise.
* tests/ansi6.test: Likewise.
* tests/ansi7.test: Likewise.
* tests/ansi8.test: Likewise.
* tests/ansi9.test: Likewise.
* tests/cxxansi.test: Likewise.
* tests/libobj8.test: Likewise.
* tests/subobj3.test: Likewise.
* tests/Makefile.am (TESTS): Update.

13 years agodocs: remove description of de-ANSI-fication support from manual
Stefano Lattarini [Sun, 28 Aug 2011 13:06:59 +0000 (15:06 +0200)] 
docs: remove description of de-ANSI-fication support from manual

* doc/automake.texi (Auxiliary Programs): Remove mention of
`ansi2knr.c' and `ansi2knr.1'.
(Obsolete Macros): Remove mention of `AM_C_PROTOTYPES'.  Do not
index it nor variables `ANSI2KNR' and `U' anymore.
(List of Automake options): Remove mention of `ansi2knr' option,
and obsolete entries for concept and option indexes.
(Optional): Remove entry about `AM_C_PROTOTYPES'.
(@c LocalWords): Remove `ansi' and `knr'.
(@menu, @detailmenu): Remove entries about de-ANSI-fication
support.

13 years agoMerge branch 'master' into test-protocols
Stefano Lattarini [Sun, 28 Aug 2011 10:25:31 +0000 (12:25 +0200)] 
Merge branch 'master' into test-protocols

* master:
  tests: list "forgotten" test script in TESTS
  ylwrap: fix unusual indentation whitespace

13 years agofix: regenerate tests/Makefile.in
Stefano Lattarini [Fri, 26 Aug 2011 10:19:15 +0000 (12:19 +0200)] 
fix: regenerate tests/Makefile.in

13 years agotests: fix spurious failure for awk implementation of TAP driver
Stefano Lattarini [Fri, 26 Aug 2011 09:11:36 +0000 (11:11 +0200)] 
tests: fix spurious failure for awk implementation of TAP driver

* tests/tap-realtime.test: The awk+shell implementation of the TAP
driver must "read ahead" of one line in order to catch the exit
status of the test script it runs.  So, in the TAP-producer script
here, be sure to echo one "dummy" line after each TAP result line
in order not to cause false positives.

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 25 Aug 2011 19:22:19 +0000 (21:22 +0200)] 
Merge branch 'maint'

* maint:
  tests: list "forgotten" test script in TESTS

13 years agoMerge branch 'maint' into java-work
Stefano Lattarini [Thu, 25 Aug 2011 19:20:57 +0000 (21:20 +0200)] 
Merge branch 'maint' into java-work

* maint:
  tests: list "forgotten" test script in TESTS
  ylwrap: fix unusual indentation whitespace

13 years agotests: list "forgotten" test script in TESTS
Stefano Lattarini [Thu, 25 Aug 2011 19:07:12 +0000 (21:07 +0200)] 
tests: list "forgotten" test script in TESTS

* tests/Makefile.am (TESTS): Also list ...
* tests/java-empty-classpath.test: ... this test.  Since we are
at it, remove trailing whitespace from a couple of lines.

13 years agoMerge branch 'maint'
Eric Blake [Thu, 25 Aug 2011 18:46:19 +0000 (12:46 -0600)] 
Merge branch 'maint'

13 years agoylwrap: fix unusual indentation whitespace
Eric Blake [Thu, 25 Aug 2011 18:37:37 +0000 (12:37 -0600)] 
ylwrap: fix unusual indentation whitespace

* lib/ylwrap: Convert tabs to spaces.
Reported by Karl Berry.

Signed-off-by: Eric Blake <eblake@redhat.com>
13 years agotap/awk: allow escaping of TAP directives
Stefano Lattarini [Thu, 25 Aug 2011 11:22:58 +0000 (13:22 +0200)] 
tap/awk: allow escaping of TAP directives

* lib/tap-driver.sh (setup_result_obj): Handle escaping of TAP
directives in a way tat is (mostly) compatible by what is done
by the TAP::Parser module.
With this change, the tests `tap-escape-directive.test' and
`tap-escape-directive-2.test' now also pass with the shell/awk
implementation of the TAP driver.

13 years agocoverage: more about escaping of TAP directives
Stefano Lattarini [Thu, 25 Aug 2011 10:55:55 +0000 (12:55 +0200)] 
coverage: more about escaping of TAP directives

* tests/tap-escape-directive.test: Make grepping of testsuite
progress output slightly stricter.
* tests/tap-escape-directive-2.test: New test (failing with the
awk implementation of the TAP driver).
* tests/Makefile.am (tap_with_common_setup_tests): Update.

13 years agotap: improve syncing between awk+shell and perl implementations
Stefano Lattarini [Thu, 25 Aug 2011 10:44:32 +0000 (12:44 +0200)] 
tap: improve syncing between awk+shell and perl implementations

* lib/tap-driver.pl (stringify_test_result): Renamed ...
(stringify_result_obj): ... to this.  Break up a clause in the
long "if/elsif/.../else" construct to avoid unaesthetic line
breaks and to be more synced with the sibling function in
`tap-driver.sh'.  Rename the `$result', `$PASS' and `$FAIL'
variables to respectively `$result_obj', `$COOKED_PASS' and
`$COOKED_FAIL', for clarity and better syncing.
(handle_tap_test): Renamed  ...
(handle_tap_result): ... to this, and change the name of the
`$test' local variable to `$result_obj'.
(extract_comment): Reimplement using the simpler `index' and
`substr' builtins, rather than with more advanced uses of
regular expressions.
(%test_results, @test_results): Renamed respectively ...
(%test_results_seen, @test_results_list): ... to these, and
related adjustments throughout the `TEST_RESULTS' block.
(main, get_global_test_result): Refactor and do some cosmetic
changes to make these functions clearer and better synced with
sibling code in `tap-driver.sh'.
Other minor cosmetic and typo fixes.
* lib/tap-driver.sh (extract_tap_comment): Remove outdated
"FIXME" comments.
(get_global_test_result): Small reordering to make it better
synced with its sibling function in `tap-driver.pl'.
(stringify_result_obj): Consistently use `result_obj' as the
parameter name.
Other minor cosmetic and typo fixes.

13 years agotap/perl: don't redirect perl warnings/errors to log files
Stefano Lattarini [Thu, 25 Aug 2011 08:53:23 +0000 (10:53 +0200)] 
tap/perl: don't redirect perl warnings/errors to log files

With this change, the test `tap-driver-stderr.test' also passes
with the perl implementation of the TAP driver.

* lib/tap-driver.pl (start): Save the original stderr into the
`OLDERR' file handle, and call ...
(trap_perl_warnings_and_errors): ... this new function, trapping
the `__WARN__' and `__DIE__' "pseudo-signals" to ensure that the
warning and error messages goes to that original stderr stream.
Since we are at it, be sure to prepend all possible "die" message
with the name of the script as given by the `$ME' variable.

13 years agotap/perl: add copyright notice, version string, and emacs stuff
Stefano Lattarini [Thu, 25 Aug 2011 08:05:51 +0000 (10:05 +0200)] 
tap/perl: add copyright notice, version string, and emacs stuff

* lib/tap-driver.pl: Add proper copyright notice and bug reporting
address.  Remove obsolete heading comments.  Add trailing comments
for emacs w.r.t. code-formatting rules and automatic updating of
the date-based script version saved into the `$VERSION' variable.
($VERSION): Define to the current UTC date.

13 years agotap/awk: don't redirect awk stderr to log files
Stefano Lattarini [Wed, 24 Aug 2011 09:27:00 +0000 (11:27 +0200)] 
tap/awk: don't redirect awk stderr to log files

* lib/tap-driver.sh: Handle the file descriptors redirections
more smartly, to avoid sending error messages from awk (about
e.g. syntax or I/O errors) to the log files instead that to the
console.
* tests/tap-driver-stderr.test: New test, verifying the improved
driver behaviour.  Notice that this test still fails when using
the perl implementation of the TAP driver.
* tests/Makefile.am (tap_other_tests): Update.

13 years agotap/awk: remove obsolete "FIXME" comment
Stefano Lattarini [Wed, 24 Aug 2011 07:54:22 +0000 (09:54 +0200)] 
tap/awk: remove obsolete "FIXME" comment

* lib/tap-driver.sh: Remove obsolete "FIXME" comment about our
driver losing the exit status of the tested program; this issue
has been solved in precedent commit `v1.11-1052-gd630a0d'.  Fix
an unrelated typo in comments since we are at it.

13 years agotestsuite: avoid spurious failure on Solaris
Stefano Lattarini [Mon, 22 Aug 2011 14:32:09 +0000 (16:32 +0200)] 
testsuite: avoid spurious failure on Solaris

* tests/tap-signal.test (signal_caught): Fix a regression from
commit `v1.11-1052-gd630a0d' that was causing this test to fail
spuriously on Solaris (due to an already worked-around Solaris
/bin/sh bug, see commit `v1.11-981-g0ef3ef5').

13 years agotestsuite: use the new awk+shell TAP driver in our own testsuite
Stefano Lattarini [Mon, 22 Aug 2011 13:43:57 +0000 (15:43 +0200)] 
testsuite: use the new awk+shell TAP driver in our own testsuite

* tests/Makefile.am (TAP_LOG_DRIVER): Redefine to use the new
awk+shell tap driver, which should be complete enough for use in
a "controlled" production environment.

13 years agotap/awk: handle non-zero exit status from the test command
Stefano Lattarini [Mon, 22 Aug 2011 13:00:09 +0000 (15:00 +0200)] 
tap/awk: handle non-zero exit status from the test command

* lib/tap-driver.sh (get_test_exit_message): New function in the
awk script, used to extract the exit status of the test program,
or at least a good guess of it.
(write_test_results): Use it, reporting an ERROR result if it
detects that the test program exited with a non-zero status.
* tests/tap-signal.test: Account for the differences in the
error messages generated by the awk and perl TAP drivers.  Fix
an unrelated typo in comments since we are at it.

13 years agotap/awk: prepare to fetch the exit status of the test command
Stefano Lattarini [Mon, 22 Aug 2011 10:14:32 +0000 (12:14 +0200)] 
tap/awk: prepare to fetch the exit status of the test command

* lib/tap-driver.sh: Rewrite some logic in the main parsing loop,
to make it possible to read the exit status of the test command
from the last line of the input stream.

13 years agotap/awk: refactor for future changes
Stefano Lattarini [Mon, 22 Aug 2011 10:00:05 +0000 (12:00 +0200)] 
tap/awk: refactor for future changes

* lib/tap-driver.sh: Rewrite the awk script so that the parsing
of the input stream is implemented as a hand-rolled loop in the
BEGIN block, using the `getline' builtin.

13 years agotestsuite: avoid spurious failure if rst2html program is missing
Stefano Lattarini [Mon, 22 Aug 2011 08:40:12 +0000 (10:40 +0200)] 
testsuite: avoid spurious failure if rst2html program is missing

* tests/tap-html.test ($required): Require `rst2html'.

13 years agotap/awk: support Solaris /usr/xpg4/bin/awk
Stefano Lattarini [Mon, 22 Aug 2011 08:02:11 +0000 (10:02 +0200)] 
tap/awk: support Solaris /usr/xpg4/bin/awk

* lib/tap-driver.sh: Use `\t', not `\\t', to represent tabulation
character in regexps, even when inside double-quoted strings; that
seems to be more portable to Solaris 10 XPG4 awk.

13 years agotap/awk: support Solaris /usr/bin/nawk
Stefano Lattarini [Mon, 22 Aug 2011 06:43:22 +0000 (08:43 +0200)] 
tap/awk: support Solaris /usr/bin/nawk

* lib/tap-driver.sh (close_or_die): Remove, the use of the `close'
builtin in there was confusing /usr/bin/nawk from Solaris 10 into
a syntax error.
(write_test_results): Simply use `close' on the `*.trs' file, that
should be enough.

13 years agotap/awk: correctly extract message from SKIP plans
Stefano Lattarini [Sun, 21 Aug 2011 21:15:45 +0000 (23:15 +0200)] 
tap/awk: correctly extract message from SKIP plans

* lib/tap-driver.sh (/^1\.\.0+[ \t]*#/): Add a forgotten `?' to
the regex used to extract the skip message from a "1..0" TAP plan.
* tests/planskip.test: Check for the just-fixed bug.
* tests/tap-planskip-unplanned-corner.test: Don't be too strict
w.r.t. the formatting of the "skip whole test" message, to avoid
failing due to bugs irrelevant for this test (like the one just
fixed).

13 years agotap/awk: support colorized output
Stefano Lattarini [Sun, 21 Aug 2011 18:09:34 +0000 (20:09 +0200)] 
tap/awk: support colorized output

* lib/tap-driver.sh: Pass definition of colors to the BEGIN block
of the awk script, using ...
($init_colors): ... this new variable, which supersedes ...
($red, $grn, $lgn, $blu, $mgn, $std): ... these variables, which
have been consequently removed.
($color_tests): We don't have to pass this anymore to the awk
script, so do not convert it to a numeric boolean.
(decorate_result): Implement for real.

With this change, the test 'tap-color.test' now passes.

13 years agotap: real (but still incomplete) awk implementation of TAP driver
Stefano Lattarini [Sun, 21 Aug 2011 16:15:35 +0000 (18:15 +0200)] 
tap: real (but still incomplete) awk implementation of TAP driver

* lib/tap-driver.sh : Add an incomplete, but mostly working,
implementation of a TAP parser and driver in awk.  It doesn't yet
support colorized output, fetching of exit status from test
programs, nor a way to escape TAP directives in TAP result lines,
but passes all the tests of TAP support in the automake testsuite,
apart from the following ones:
  - tap-color.test
  - tap-escape-directive.test
  - tap-exit.test
  - tap-missing-plan-and-bad-exit.test
  - tap-passthrough-exit.test
  - tap-planskip-badexit.test
  - tap-planskip-unplanned-corner.test
  - tap-signal.test

Tested on Debian GNU/Linux with GNU awk 3.1.7 and 3.0.2, "original
awk" 2010-05-23-1, and mawk 1.3.3-15 (with which also the test
`tap-realtime.test' fails, in addition to those listed above).

13 years agotestsuite: fix spurious failure due to Solaris 'wc' incompatibility
Stefano Lattarini [Sun, 21 Aug 2011 16:56:21 +0000 (18:56 +0200)] 
testsuite: fix spurious failure due to Solaris 'wc' incompatibility

* tests/tap-number-wordboundary.test ($planned): Strip any extra
whitespace from the output of `wc', to cater to Solaris 10.

13 years agocoverage: keyword "SKIP" in TAP plan is case-insensitive
Stefano Lattarini [Sun, 21 Aug 2011 13:33:03 +0000 (15:33 +0200)] 
coverage: keyword "SKIP" in TAP plan is case-insensitive

* tests/tap-planskip-case-insensitive.test: New test.
* tests/tap-planskip.test: Remove now-duplicated checks.
* tests/Makefile.am (tap_with_common_setup_tests): Update.

13 years agocoverage: ambiguous use of TAP "TODO"/"SKIP" directives
Stefano Lattarini [Sun, 21 Aug 2011 10:25:39 +0000 (12:25 +0200)] 
coverage: ambiguous use of TAP "TODO"/"SKIP" directives

* tests/tap-ambiguous-directive.test: New test.
* tests/tap-todo-skip-together.test: Reference it in heading
comments.
* tests/Makefile.am (tap_with_common_setup_tests): Update.

13 years agocoverage: non-directive comments in TAP results are preserved
Stefano Lattarini [Sun, 21 Aug 2011 09:01:51 +0000 (11:01 +0200)] 
coverage: non-directive comments in TAP results are preserved

* tests/tap-result-comment.test: New test.
* tests/Makefile.am (tap_with_common_setup_tests): Update.

13 years agocoverage: TAP result number followed by non-whitespace word boundary
Stefano Lattarini [Sat, 20 Aug 2011 16:30:12 +0000 (18:30 +0200)] 
coverage: TAP result number followed by non-whitespace word boundary

* tests/tap-number-wordboundary.test: New test.
* tests/Makefile.am (tap_with_common_setup_tests): Update.

13 years agocoverage: a TAP result numbered "0" is always out-of-order
Stefano Lattarini [Sat, 20 Aug 2011 15:32:29 +0000 (17:32 +0200)] 
coverage: a TAP result numbered "0" is always out-of-order

* tests/tap-test-number-0.test: New, checks that a test result
numbered as 0 is to be considered out-of-order; this is
consistent with the behaviour of the `prove' utility.
* tests/Makefile.am (tap_with_common_setup_tests): Update.

13 years agocosmetics: fix botched indentation in perl TAP driver
Stefano Lattarini [Sat, 20 Aug 2011 11:59:45 +0000 (13:59 +0200)] 
cosmetics: fix botched indentation in perl TAP driver

* lib/tap-driver.pl (main, Getopt::Long::GetOptions): Fix
improper or botched indentation.

13 years agofix: regenerate tests/Makefile.in
Stefano Lattarini [Sat, 20 Aug 2011 12:00:25 +0000 (14:00 +0200)] 
fix: regenerate tests/Makefile.in

13 years agocoverage: some more tests on corner cases of TAP support
Stefano Lattarini [Fri, 19 Aug 2011 14:47:12 +0000 (16:47 +0200)] 
coverage: some more tests on corner cases of TAP support

* tests/tap-no-spurious.test: Extend checks verifying that a line
matching, say, the regex "^ok[a-zA-Z0-9_]" is *not* considered a
TAP result.
* tests/tap-no-spurious-numbers.test: New test, checking that our
TAP driver doesn't spuriously recognize as TAP result numbers what
is not (even if it seems pretty close).
* tests/tap-negative-numbers.test: New test, checking that our
TAP driver doesn't spuriously recognize negative TAP result
numbers, but correctly interprets them as test descriptions
instead.
* tests/tap-plan-leading-zero.test, tap-numbers-leading-zero.test:
New tests, checking how our driver fares in recognizing numbers
with leading zeroes in TAP results or TAP plans.
* tests/tap-planskip-malformed.test: New test, checking that a
malformed TAP plan is not recognized as a valid plan.
* tests/tap-plan-whitespace.test: New test, checking that a TAP
plan line with trailing whitespace is recognized and handled
correctly.
* tests/Makefile.am (tap_with_common_setup_tests): Update.

13 years agotestsuite: fix some redundant autotools calls in tests on TAP
Stefano Lattarini [Fri, 19 Aug 2011 08:14:22 +0000 (10:14 +0200)] 
testsuite: fix some redundant autotools calls in tests on TAP

* tests/tap-deps.test: Do not call autotools and configure; there
is no need to, since this script sources `tap-setup.sh'.
* tests/tap-empty-diagnostic.test: Likewise.
* tests/tap-escape-directive.test: Likewise.
* tests/tap-fancy2.test: Likewise.
* tests/tap-no-spurious.test: Likewise.
* tests/tap-out-of-order.test: Likewise.

13 years agoMerge branch 'master' into test-protocols
Stefano Lattarini [Thu, 18 Aug 2011 19:53:34 +0000 (21:53 +0200)] 
Merge branch 'master' into test-protocols

* master:
  * THANKS (Daniel Richard G.): Update e-mail address.
  java: avoid compilation errors when CLASSPATH is empty
  parallel-tests: no more spurious successes for FreeBSD make
  hacking: we now require autoconf 2.68

13 years agoMerge branch 'maint'
Stefano Lattarini [Thu, 18 Aug 2011 19:47:11 +0000 (21:47 +0200)] 
Merge branch 'maint'

* maint:
  * THANKS (Daniel Richard G.): Update e-mail address.
  java: avoid compilation errors when CLASSPATH is empty
  parallel-tests: no more spurious successes for FreeBSD make
  hacking: we now require autoconf 2.68

13 years agoMerge branch 'maint' into python-work
Stefano Lattarini [Thu, 18 Aug 2011 19:44:38 +0000 (21:44 +0200)] 
Merge branch 'maint' into python-work

* maint:
  * THANKS (Daniel Richard G.): Update e-mail address.
  java: avoid compilation errors when CLASSPATH is empty
  parallel-tests: no more spurious successes for FreeBSD make
  hacking: we now require autoconf 2.68
  test defs: more environment cleanup
  tests: fix spurious failure with Solaris make
  maintcheck: fix maintainer-check failures, both real and spurious
  docs: how to use '-I' option in AM_CPPFLAGS for best VPATH support
  tests: relax a test on amhello examples to cater to Solaris tar
  docs: add references between the 2 sections on java support
  Sync auxiliary files from upstream.

13 years agoMerge branch 'maint' into java-work
Stefano Lattarini [Thu, 18 Aug 2011 19:34:44 +0000 (21:34 +0200)] 
Merge branch 'maint' into java-work

13 years ago* THANKS (Daniel Richard G.): Update e-mail address.
Stefano Lattarini [Wed, 17 Aug 2011 07:53:07 +0000 (09:53 +0200)] 
* THANKS (Daniel Richard G.): Update e-mail address.

13 years agojava: avoid compilation errors when CLASSPATH is empty
Daniel Richard G [Tue, 16 Aug 2011 13:19:14 +0000 (15:19 +0200)] 
java: avoid compilation errors when CLASSPATH is empty

* lib/am/java.am (CLASSPATH_ENV): When redefining `$CLASSPATH',
do not append an empty component in case the previous value of
CLASSPATH is empty or unset.
* tests/java-empty-classpath.test: New test.
* tests/Makefile.am (TESTS): Update.

Fixes automake bug#9306.