Merge branch 'maint'

* maint:
  maint: move definition of XFAIL_TESTS near TESTS

Actually, after the trivial merge conflicts have been solved, what
this change actually does is moving the definition of XFAIL_TESTS
near that of handwritten_TESTS.  But the rationale is the same of
that of commit 'v1.11-761-gabf40ce' (being merged here), and still
works, so all is good.

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

diff --cc tests/Makefile.am
index baebb1f,e8feaa3..8901155
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -15,75 -17,30 +15,48 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -include $(srcdir)/parallel-tests.am
 +# Run the tests with the shell detected at configure time.
 +LOG_COMPILER = $(SHELL)
  
 -$(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
 -      $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
 +TEST_EXTENSIONS = .pl .test .tap
 +TEST_LOG_COMPILER = $(LOG_COMPILER)
 +TAP_LOG_COMPILER = $(LOG_COMPILER)
 +PL_LOG_COMPILER = $(PERL)
 +AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I $(top_srcdir)/lib -w
 +
 +TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
  
 -$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
 -      $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'` \
 -        && sed 's|^\. \./defs.*|parallel_tests=yes; &|' \
 -             < $(srcdir)/$$input >$@ \
 -        && chmod a+rx $@
 +AM_TAP_LOG_DRIVER_FLAGS = --merge
  
 -MAINTAINERCLEANFILES = $(parallel_tests)
 +EXTRA_DIST = ax/is ChangeLog-old
 +
 +TESTS = ## Will be updated later.
  
- XFAIL_TESTS = \
- all.test \
- yacc-bison-skeleton-cxx.test \
- yacc-bison-skeleton.test \
- cond17.test \
- gcj6.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 \
- lex-subobj-nodep.test \
- remake-am-pr10111.test \
- remake-m4-pr10111.test \
- txinfo5.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.
- pm/Cond2.pl \
- pm/Cond3.pl \
- pm/DisjCon2.pl \
- pm/DisjCon3.pl \
- pm/Version2.pl \
- pm/Version3.pl
- 
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.
 -TESTS_ENVIRONMENT = \
 -  test x"$$me" = x || unset me; \
 -  test x"$$required" = x || unset required; \
 -  test x"$$parallel_tests" = x || unset parallel_tests;
 -
 -TEST_EXTENSIONS = .pl .test
 +AM_TESTS_ENVIRONMENT = \
 +  for v in \
 +    me \
 +    required \
 +    am_using_tap \
 +    am_parallel_tests \
 +    am_test_prefer_config_shell \
 +    am_original_AUTOMAKE \
 +    am_original_ACLOCAL \
 +  ; do \
 +    eval test x"\$${$$v}" = x || unset $$v; \
 +  done;
 +# The 'AM_TESTS_REEXEC=no' setting tells the tests not to needlessly
 +# re-execute themselves with the shell detected at configure time, since
 +# we are already running them under it explicitly in our setup (see e.g.
 +# the definition of TEST_LOG_COMPILER above).
 +AM_TESTS_ENVIRONMENT += AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC;
 +# We want warning messages and explanations for skipped tests to go to
 +# the console if possible, so set up 'stderr_fileno_' properly.
 +AM_TESTS_FD_REDIRECT = 9>&2
 +AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
  
 -PL_LOG_COMPILER = $(PERL)
 -AM_PL_LOG_FLAGS = -Mstrict -I $(top_builddir)/lib -I $(top_srcdir)/lib -w
 +# Hand-written tests.
  
  include $(srcdir)/list-of-tests.mk
  

diff --cc tests/list-of-tests.mk
index c00b571,58f1e82..ec0f5f3
--- 1/tests/list-of-tests.mk
--- 2/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@@ -17,13 -17,26 +17,40 @@@
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -auxdir2.test \
+ XFAIL_TESTS = \
+ all.test \
 -dist-auxfile.test \
 -dist-auxfile-2.test \
 -dist-pr109765.test \
++yacc-bison-skeleton-cxx.test \
++yacc-bison-skeleton.test \
+ cond17.test \
 -txinfo5.test
+ gcj6.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 \
+ lex-subobj-nodep.test \
+ remake-am-pr10111.test \
+ remake-m4-pr10111.test \
++txinfo5.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.
++pm/Cond2.pl \
++pm/Cond3.pl \
++pm/DisjCon2.pl \
++pm/DisjCon3.pl \
++pm/Version2.pl \
++pm/Version3.pl
+ 
  perl_TESTS = \
 +pm/Cond2.pl \
 +pm/Cond3.pl \
  pm/Condition.pl \
  pm/Condition-t.pl \
 +pm/DisjCon2.pl \
 +pm/DisjCon3.pl \
  pm/DisjConditions.pl \
  pm/DisjConditions-t.pl \
  pm/Version.pl \