From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 24 Apr 2011 08:27:44 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49774dc0f635231c09372abff9d8fc31a91e39c0;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

49774dc0f635231c09372abff9d8fc31a91e39c0
diff --cc ChangeLog
index d8e0a76fa,99e4f110b..67bdf6fd2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,11 +1,18 @@@
+ 2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	tests: fix spurious failure in a test on TESTS (VPATH-related)
+ 	* check-tests-in-builddir.test: When not using the parallel-tests
+ 	option, do not check that VPATH components are not present in the
+ 	displayed test name, since the simple-tests driver do not try to
+ 	strip them.
+ 
 +2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: fix spurious failure in self-check-env-sanitize.test
 +	* tests/self-check-env-sanitize.test: Open file descriptor `5'
 +	to stdout.
 +	Fix spurious failure introduced by merge `v1.11-788-g3b0c8d5'.
 +
  2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	test: self check subroutines for skipping/failing of tests