Merge branch 'master' into testsuite-work

* master:
  tests: simplify wrapper for aclocal

diff --cc ChangeLog
index 92914b76fa9c2937523ace73fd74954435fa1a46,68db5c4beab94f5fd41d590425fdff1dde04ef3a..58ec84f5ef8a4c19a3ca86d1b0b083dec9bbdd91
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,49 -1,14 +1,60 @@@
+ 2011-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       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.
+ 
 +2011-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: remove redundant settings of `errexit' shell flag
 +      * doc-parsing-buglets-colneq-subst.test: Do not set the
 +      `errexit' shell flag, as it is already set by `tests/defs'.
 +      * doc-parsing-buglets-tabs.test: Likewise.
 +      * java-empty-classpath.test: Likewise.
 +      * vala-vpath.test: Likewise.
 +
 +2011-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: more uses of `$top_testsrcdir', in the `amhello' tests
 +      * tests/amhello-binpkg.test: Use `$top_testsrcdir' instead
 +      of `$testsrcdir/..'.
 +      * tests/amhello-cflags.test: Likewise.
 +      * tests/amhello-cross-compile.test: Likewise.
 +
 +2011-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: avoid creating useless files in the `amhello' tests
 +      * tests/amhello-binpkg.test: Define `$am_create_testdir' to
 +      "empty" before sourcing ./defs, to avoid bringing in unused
 +      auxiliary files.
 +      * tests/amhello-cflags.test: Likewise.
 +      * tests/amhello-cross-compile.test: Likewise.
 +
 +2011-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      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.
 +
 +2011-09-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      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.
 +
  2011-09-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        automake: fix regression due to de-ansification support removal

diff --cc tests/defs-static.in
Simple merge