Merge branch 'master' into ng/master

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/list-of-tests.mk
index 5a05b1ef86ec9863874b1b99b8bdce9dc22d48f9,af114adf6651a55abced9ebcf220c4f4b77b4ade..1b8c68f56ac878d3656070a67147a331da11f623
--- 1/tests/list-of-tests.mk
--- 2/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@@ -17,6 -17,36 +17,36 @@@
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -lex-subobj-nodep.test \
+ # FIXME: this "expected failures" are in truth an hack used to
+ # FIXME: to verify that some incorrect usages of our perl libraries
+ # FIXME: raise an error.  We should find a cleaner way to check that.
+ perl_fake_XFAIL_TESTS = \
+ pm/Cond2.pl \
+ pm/Cond3.pl \
+ pm/DisjCon2.pl \
+ pm/DisjCon3.pl \
+ pm/Version2.pl \
+ pm/Version3.pl
+ 
+ XFAIL_TESTS = \
+ all.test \
+ yacc-bison-skeleton-cxx.test \
+ yacc-bison-skeleton.test \
+ cond17.test \
+ gcj6.test \
++interp3.test \
+ override-conditional-2.test \
+ dist-pr109765.test \
+ instdir-cond2.test \
+ java-nobase.test \
+ objext-pr10128.test \
+ parallel-tests-many.test \
+ pr8365-remake-timing.test \
+ remake-am-pr10111.test \
+ remake-m4-pr10111.test \
+ txinfo5.test \
+ $(perl_fake_XFAIL_TESTS)
+ 
  perl_TESTS = \
  pm/Cond2.pl \
  pm/Cond3.pl \