Merge branch 'fix-vala-vpath-test' into maint

diff --cc ChangeLog
index 70410d1d4e04406b0ca9e77c8724554df738751a,3619719ed6eb7ebe0cf22a6b209031ea11192cdf..add6c9c50f5c7193ddbeb4234c1b1cda743457d8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,9 +1,20 @@@
 -2011-09-02 Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 2011-09-04 Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       fix: list test 'vala-vpath.test' in XFAIL_TESTS
+       * tests/Makefile.am (XFAIL_TESTS): Update.
+ 
 +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>
  
        coverage: vala support failing for VPATH from-scratch builds
        * tests/vala-vpath.test: New test, xfailing.