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

12 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)

12 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)

12 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.

12 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'

12 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.

12 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

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

12 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

12 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

12 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.

12 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.

12 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

12 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.

12 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

12 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

12 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

12 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.

12 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

12 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'.

12 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

12 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.

12 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

12 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.

12 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

12 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.

12 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

12 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>
12 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

12 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.

12 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

12 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.

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

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

12 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

12 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.

12 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

12 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.

12 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.

12 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.

12 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'.

12 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.

12 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.

12 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.

12 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.

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

12 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

12 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

12 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.

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

12 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>
12 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

12 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.

12 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

12 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.

12 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.

12 years agoparallel-tests: no more spurious successes for FreeBSD make
Stefano Lattarini [Fri, 12 Aug 2011 16:29:28 +0000 (18:29 +0200)]
parallel-tests: no more spurious successes for FreeBSD make

Work around a bug of FreeBSD make bug that was causing the
automake-generated "check" target to complete with success
even if some tests failed; this happened only when FreeBSD
make was run in concurrent mode (as in, e.g., "make -j2
check").  The bug is not present in NetBSD make.

This change fixes automake bug#9245:
 <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9245>

See also FreeBSD PR bin/159730:
 <http://www.freebsd.org/cgi/query-pr.cgi?pr=159730>

* lib/am/check.am [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Use a
more "safe" (and apparently redundant) idiom to exit with error,
so that the non-zero exit status is picked up also by FreeBSD
make when it's running in concurrent mode.
* NEWS: Update.
* tests/check-concurrency-bug9245.test: New test.
* tests/Makefile.am (TESTS): Update.

12 years agohacking: we now require autoconf 2.68
Stefano Lattarini [Thu, 11 Aug 2011 21:24:53 +0000 (23:24 +0200)]
hacking: we now require autoconf 2.68

* HACKING ("Working in git"): Use autoconf and autom4te 2.68,
not 2.67, in the examples.

12 years agocoverage: possible infinite recursion in the test harness
Stefano Lattarini [Wed, 10 Aug 2011 14:03:35 +0000 (16:03 +0200)]
coverage: possible infinite recursion in the test harness

Motivated by a regression in the 'test-protocols' branch.

* tests/parallel-tests-fork-bomb.test: New test, checking that
if $(TEST_SUITE_LOG) is in $(TEST_LOGS), we obtain a diagnosed
error rather than a make hang or a fork bomb.
* tests/Makefile.am (TESTS): Update.

12 years agotest defs: yet more environment cleanup
Stefano Lattarini [Wed, 10 Aug 2011 08:44:56 +0000 (10:44 +0200)]
test defs: yet more environment cleanup

* tests/defs: Also unset the TEST_SUITE_LOG variable.

12 years agotests: fix various blunders in 'suffix-chain.test'
Stefano Lattarini [Tue, 9 Aug 2011 20:44:55 +0000 (22:44 +0200)]
tests: fix various blunders in 'suffix-chain.test'

* tests/suffix-chain.test: Fix various blunders that were causing
this test to fail spuriously: append to `configure.in', not to
`configure.ac'; add a `;' character after the `return' statement
in an input file; use tabs, not spaces, to indent Makefile recipes;
and use more uncommon suffixes that don't trigger built-in recipes
with FreeBSD make.

12 years agotests: don't let a known Solaris make bug poison too many tests
Stefano Lattarini [Tue, 9 Aug 2011 15:51:51 +0000 (17:51 +0200)]
tests: don't let a known Solaris make bug poison too many tests

See automake bug#7670 and bug#7824.

* tests/defs (make_can_chain_suffix_rules): New function, tell
whether the make implementation in use can chain suffix rules
automatically or not.
* tests/suffix3.test: Use it to avoid issuing calls to make that
are unportable to make implementations that are not smart enough
to chain suffix rules automatically.
* tests/suffix8.test: Use it to avoid issuing calls to make that
* tests/suffix10.test: Use it to avoid issuing calls to make that
* tests/suffix11.test: Use it to avoid issuing calls to make that
* tests/suffix-chain.test: New test, exposes the limitation that
we have papered over in the tests above.

12 years agogitignore: more use of anchors
Stefano Lattarini [Tue, 9 Aug 2011 14:43:08 +0000 (16:43 +0200)]
gitignore: more use of anchors

* .gitignore: Anchor files that are intended to be ignored only
if found in the same directory of the `.gitignore' file, not also
in its subdirectories.
* doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
lib/Automake/tests/.gitignore, tests/.gitignore: Likewise.  Also,
where needed, add new entries that were once implied by the
non-anchored entries in the upper-level `.gitignore' files.

12 years agotestsuite: avoid spurious failure of self checks on Solaris
Stefano Lattarini [Tue, 9 Aug 2011 13:24:03 +0000 (15:24 +0200)]
testsuite: avoid spurious failure of self checks on Solaris

This is just a quick workaround to prevent having too much noise
in the testsuite; more proper fixes have been committed into the
'testsuite-work' branch.

* tests/self-check-dir.test: Relax a test to avoid unimportant
failure on Solaris 10.
* tests/self-check-exit.test: Likewise.

12 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 8 Aug 2011 12:40:59 +0000 (14:40 +0200)]
Merge branch 'maint'

* maint:
  test defs: more environment cleanup

12 years agotest defs: more environment cleanup
Stefano Lattarini [Mon, 8 Aug 2011 12:39:16 +0000 (14:39 +0200)]
test defs: more environment cleanup

* tests/defs.in: Also unset variables AM_COLOR_TESTS and
AM_TESTS_ENVIRONMENT.

12 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 8 Aug 2011 08:29:25 +0000 (10:29 +0200)]
Merge branch 'maint'

* maint:
  tests: fix spurious failure with Solaris make

12 years agoMerge branch 'am-distcheck-configure-flags' into maint
Stefano Lattarini [Mon, 8 Aug 2011 08:25:00 +0000 (10:25 +0200)]
Merge branch 'am-distcheck-configure-flags' into maint

* am-distcheck-configure-flags:
  tests: fix spurious failure with Solaris make

12 years agotests: fix spurious failure with Solaris make
Stefano Lattarini [Mon, 8 Aug 2011 08:20:47 +0000 (10:20 +0200)]
tests: fix spurious failure with Solaris make

* tests/distcheck-configure-flags-am.test: Avoid using `+=' too
liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
so introduced, in conjunction with single quotes, might confuse
Solaris make.

12 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 3 Aug 2011 14:40:15 +0000 (16:40 +0200)]
Merge branch 'maint'

* maint:
  maintcheck: fix maintainer-check failures, both real and spurious

12 years agomaintcheck: fix maintainer-check failures, both real and spurious
Stefano Lattarini [Wed, 3 Aug 2011 14:35:49 +0000 (16:35 +0200)]
maintcheck: fix maintainer-check failures, both real and spurious

* tests/amhello-binpkg.test: Use "$MAKE", not bare "make".
* Makefile.am (sc_perl_local): Also allow perl special variable
`$~' to be localized.  And be slightly laxer in the regexp, to
allow for usages like "local $_ = $foo;".
(sc_tests_overriding_macros_on_cmdline): Also allow for command
line overriding of the `DISABLE_HARD_ERRORS' make variable.  Try
to avoid false positives for usages like "$MAKE || st=$?".

12 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 3 Aug 2011 13:09:43 +0000 (15:09 +0200)]
Merge branch 'maint'

* maint:
  docs: how to use '-I' option in AM_CPPFLAGS for best VPATH support

12 years agodocs: how to use '-I' option in AM_CPPFLAGS for best VPATH support
Bruno Haible [Wed, 3 Aug 2011 13:05:22 +0000 (15:05 +0200)]
docs: how to use '-I' option in AM_CPPFLAGS for best VPATH support

* doc/automake.texi (Program Variables): Recommend -I options to
both the build directory and the source directory when needed.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 24 Jul 2011 09:17:11 +0000 (11:17 +0200)]
Merge branch 'maint'

* maint:
  tests: relax a test on amhello examples to cater to Solaris tar

13 years agoMerge branch 'fix-amhello-examples-tests' into maint
Stefano Lattarini [Sat, 23 Jul 2011 13:10:07 +0000 (15:10 +0200)]
Merge branch 'fix-amhello-examples-tests' into maint

* fix-amhello-examples-tests:
  tests: relax a test on amhello examples to cater to Solaris tar

13 years agotests: relax a test on amhello examples to cater to Solaris tar
Stefano Lattarini [Sat, 23 Jul 2011 13:09:23 +0000 (15:09 +0200)]
tests: relax a test on amhello examples to cater to Solaris tar

* tests/amhello-binpkg.test: When the tar implementation in use
is not GNU tar, relax the tests on tar output, to avoid spurious
failures.  For example, "tar cvf ..." with GNU tar can output
lines like "./usr/bin/hello" on the standard output, while with
Solaris tar it can output lines like "a ./usr/bin/hello 8K" on
standard output, and with Heirloom tar it can output lines like
"a ./usr/bin/hello 15 tape blocks" on standard error.

13 years agotest defs: function 'is_newest' now works also with directories
Stefano Lattarini [Sat, 23 Jul 2011 11:55:20 +0000 (13:55 +0200)]
test defs: function 'is_newest' now works also with directories

* tests/defs (is_newest): Call `find' with the `-prune' option,
so that it won't descend in the directories (which could cause
spurious results).
* tests/self-check-is_newest: Extend accordingly.

From a report by Jim Meyering, see automake bug#9147.

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 22 Jul 2011 08:27:13 +0000 (10:27 +0200)]
Merge branch 'maint'

* maint:
  docs: add references between the 2 sections on java support

13 years agodocs: add references between the 2 sections on java support
Benoit Sigoure [Fri, 15 Jul 2011 23:49:45 +0000 (16:49 -0700)]
docs: add references between the 2 sections on java support

* doc/automake.texi (Java Support, Java): Add cross-references.

13 years agoMerge branch 'maint'
Ralf Wildenhues [Wed, 20 Jul 2011 21:35:32 +0000 (23:35 +0200)]
Merge branch 'maint'

13 years agoSync auxiliary files from upstream.
Ralf Wildenhues [Wed, 20 Jul 2011 21:31:54 +0000 (23:31 +0200)]
Sync auxiliary files from upstream.

* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
lib/texinfo.tex: Sync from upstream.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
13 years agoMerge branch 'maint' into python-work
Stefano Lattarini [Fri, 8 Jul 2011 12:34:50 +0000 (14:34 +0200)]
Merge branch 'maint' into python-work

* maint:
  fix typo in recent ChangeLog entry
  docs, tests: synchronize examples on silent-rules from config.site
  tests: fix weakness in 'tests-environment-backcompat.test'
  tests: portability fixes in tests on amhello examples
  remake: add test ensuring that slower remakes don't hang
  remake: fix outdated comment in configure.am
  docs, tests: synchronize examples from docs to tests
  cosmetics: fix typos in recent ChangeLog entries

13 years agoMerge branch 'maint' into java-work
Stefano Lattarini [Fri, 8 Jul 2011 12:34:26 +0000 (14:34 +0200)]
Merge branch 'maint' into java-work

* maint:
  fix typo in recent ChangeLog entry
  docs, tests: synchronize examples on silent-rules from config.site
  tests: fix weakness in 'tests-environment-backcompat.test'
  tests: portability fixes in tests on amhello examples
  remake: add test ensuring that slower remakes don't hang
  remake: fix outdated comment in configure.am
  docs, tests: synchronize examples from docs to tests

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 8 Jul 2011 09:57:19 +0000 (11:57 +0200)]
Merge branch 'maint'

* maint:
  fix typo in recent ChangeLog entry
  docs, tests: synchronize examples on silent-rules from config.site
  tests: fix weakness in 'tests-environment-backcompat.test'

13 years agoMerge branch 'fix-tests-environment-backcompat-example' into maint
Stefano Lattarini [Fri, 8 Jul 2011 08:48:23 +0000 (10:48 +0200)]
Merge branch 'fix-tests-environment-backcompat-example' into maint

* fix-tests-environment-backcompat-example:
  tests: fix weakness in 'tests-environment-backcompat.test'

13 years agoMerge branch 'fix-changelog-typo' into maint
Stefano Lattarini [Fri, 8 Jul 2011 08:48:22 +0000 (10:48 +0200)]
Merge branch 'fix-changelog-typo' into maint

* fix-changelog-typo:
  fix typo in recent ChangeLog entry

13 years agoMerge branch 'doc-silent-rules-reference-config-site-test' into maint
Stefano Lattarini [Fri, 8 Jul 2011 08:48:22 +0000 (10:48 +0200)]
Merge branch 'doc-silent-rules-reference-config-site-test' into maint

* doc-silent-rules-reference-config-site-test:
  docs, tests: synchronize examples on silent-rules from config.site

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

13 years agodocs, tests: synchronize examples on silent-rules from config.site
Stefano Lattarini [Fri, 8 Jul 2011 08:43:33 +0000 (10:43 +0200)]
docs, tests: synchronize examples on silent-rules from config.site

* doc/automake.texi (Automake silent-rules Option): Reference test
'silent-configsite.test' in comments.

13 years agotests: fix weakness in 'tests-environment-backcompat.test'
Stefano Lattarini [Fri, 8 Jul 2011 08:34:54 +0000 (10:34 +0200)]
tests: fix weakness in 'tests-environment-backcompat.test'

* tests/tests-environment-backcompat.test: Do not override the
content of xfailing test `baz.test' with a "weaker" version that
fails unconditionally: the test must fail only when the 'strict'
pragma is in use, in order not to reduce coverage.

13 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 8 Jul 2011 07:54:38 +0000 (09:54 +0200)]
Merge branch 'maint'

* maint:
  tests: portability fixes in tests on amhello examples
  remake: add test ensuring that slower remakes don't hang
  remake: fix outdated comment in configure.am

13 years agoMerge branch 'fix-amhello-examples-tests' into maint
Stefano Lattarini [Fri, 8 Jul 2011 07:41:27 +0000 (09:41 +0200)]
Merge branch 'fix-amhello-examples-tests' into maint

* fix-amhello-examples-tests:
  tests: portability fixes in tests on amhello examples

13 years agotests: portability fixes in tests on amhello examples
Stefano Lattarini [Wed, 6 Jul 2011 08:31:03 +0000 (10:31 +0200)]
tests: portability fixes in tests on amhello examples

* tests/amhello-binpkg.test: Don't use "tar xzf too.tag.gz" to
extract a gzip-compressed tarball, that's unportable to some
tar implementations; use the "gzip -dc fo.tar.gz | tar xf -"
idiom instead.
* tests/amhello-cflags.test: Likewise.
* tests/amhello-cross-compile.test: Likewise.

Suggestion from Ralf Wildenhues.

13 years agoMerge branch 'remake-rules-non-GNU-make' into maint
Stefano Lattarini [Mon, 4 Jul 2011 09:44:39 +0000 (11:44 +0200)]
Merge branch 'remake-rules-non-GNU-make' into maint

* remake-rules-non-GNU-make:
  remake: add test ensuring that slower remakes don't hang
  remake: fix outdated comment in configure.am

13 years agoremake: add test ensuring that slower remakes don't hang
Stefano Lattarini [Mon, 4 Jul 2011 09:41:34 +0000 (11:41 +0200)]
remake: add test ensuring that slower remakes don't hang

* tests/remake-subdir-long-time.test: New test.
* tests/Makefile.am (TESTS): Update.

Suggestion by Ralf Wildenhues.

13 years agoremake: fix outdated comment in configure.am
Stefano Lattarini [Mon, 4 Jul 2011 08:54:02 +0000 (10:54 +0200)]
remake: fix outdated comment in configure.am

* lib/am/configure.am: Fix comment falsified by changes in
commit `v1.11-366-gbee9871'.

Suggestion by Ralf Wildenhues.

13 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 3 Jul 2011 13:45:02 +0000 (15:45 +0200)]
Merge branch 'maint'

* maint:
  docs, tests: synchronize examples from docs to tests

13 years agodocs, tests: synchronize examples from docs to tests
Stefano Lattarini [Thu, 30 Jun 2011 18:05:25 +0000 (20:05 +0200)]
docs, tests: synchronize examples from docs to tests

* tests/README (Writing test cases): Give suggestions on how to
keep test cases and examples in the documentation synchronized.
* doc/automake.texi: Improve or fix existing testcase-referencing
comments, and add many new ones.
* HACKING (Administrivia): Suggest to test complex examples and
idioms from the manual.
* tests/specflg8.test: Improve synchronization with the example
in the manual.
* tests/output11.test:Likewise.
* tests/txinfo21.test:Likewise.
* tests/interp.test: Likewise.  Since we are at it, and enable
the `errexit' shell flag, do related changes, and add trailing
`:'command.
* tests/amhello-cflags.test: New test.
* tests/amhello-cross-compile.test: Likewise.
* tests/amhello-binpkg.test: Likewise.
* tests/tests-environment-backcompat: Likewise.
* tests/parallel-tests-log-compiler-example.test: Likewise.
* tests/Makefile.am (TESTS): Update.

13 years agocoverage: new test on parallel-tests TESTS runtime overriding
Stefano Lattarini [Thu, 30 Jun 2011 14:37:19 +0000 (16:37 +0200)]
coverage: new test on parallel-tests TESTS runtime overriding

* tests/parallel-tests-cmdline-override.test: New test, check that
we can use indirections when overriding TESTS and TEST_LOGS from
the command line.
* tests/Makefile.am (TESTS): Update.

13 years agoMerge branch 'maint' into java-work
Stefano Lattarini [Thu, 30 Jun 2011 15:36:08 +0000 (17:36 +0200)]
Merge branch 'maint' into java-work

* maint:
  cosmetics: fix typos in recent ChangeLog entries