From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 4 Sep 2011 15:28:49 +0000 (+0200)
Subject: Merge branch 'fix-vala-vpath-test' into maint
X-Git-Tag: v1.11.1b~19^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eda087adfd260504766cf0667fac4dc80e2c0b91;p=thirdparty%2Fautomake.git

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

eda087adfd260504766cf0667fac4dc80e2c0b91
diff --cc ChangeLog
index 70410d1d4,3619719ed..add6c9c50
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,9 +1,20 @@@
+ 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>
 +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.