Merge branch 'test-protocols' into testsuite-work

* test-protocols:
  * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
  fix: list test 'vala-vpath.test' in XFAIL_TESTS

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
index d166f25,4c3046d..4ca74d1
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -48,8 -31,78 +48,9 @@@ gcj6.test 
  override-conditional-2.test \
  pr8365-remake-timing.test \
  yacc-dist-nobuild-subdir.test \
+ vala-vpath.test \
  txinfo5.test
  
 -
 -include $(srcdir)/parallel-tests.am
 -
 -$(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
 -      $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
 -
 -$(parallel_tests): Makefile.am
 -      $(AM_V_at)rm -f $@ $@-t
 -      $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
 -      { echo '#!/bin/sh'; \
 -        echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
 -        echo; \
 -        echo '# Ensure proper definition of $$testsrcdir.'; \
 -        echo '. ./defs-static || exit 99'; \
 -        echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \
 -        echo; \
 -        echo "# Run the test with Automake's parallel-tests driver enabled."; \
 -        echo 'parallel_tests=yes'; \
 -        echo "# In the spirit of VPATH, we prefer a test in the build tree"; \
 -        echo "# over one in the source tree."; \
 -        echo "if test -f \"./$$input\"; then"; \
 -        echo "  . \"./$$input\""; \
 -        echo 'else'; \
 -        echo "  . \"\$$testsrcdir/$$input\""; \
 -        echo 'fi'; \
 -      } > $@-t
 -      $(AM_V_at)chmod a+rx $@-t && mv -f $@-t $@
 -
 -MAINTAINERCLEANFILES += $(parallel_tests)
 -EXTRA_DIST += gen-parallel-tests
 -
 -
 -include $(srcdir)/instspc-tests.am
 -
 -$(srcdir)/instspc-tests.am: instspc-tests.sh Makefile.am
 -      $(AM_V_GEN)($(am__cd) $(srcdir) \
 -        && $(SHELL) ./instspc-tests.sh --generate-makefile) >$@
 -
 -$(instspc_tests): Makefile.am
 -      $(AM_V_at)rm -f $@ $@-t
 -      $(AM_V_GEN) :; \
 -        base=`expr 'x/$@' : 'x.*/instspc-\(.*\)\.test$$'`; \
 -        name=`expr x"$$base" : x'\(.*\)-'`; \
 -        action=`expr x"$$base" : x'.*-\(.*\)'`; \
 -        { \
 -          echo '#!/bin/sh'; \
 -          echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
 -          echo; \
 -          echo '# Ensure proper definition of $$testsrcdir.'; \
 -          echo '. ./defs-static || exit 99'; \
 -          echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \
 -          echo; \
 -          echo "instspc_test_name='$$name'"; \
 -          echo "instspc_action='test-$$action'"; \
 -          echo ". \$$testsrcdir/instspc-tests.sh"; \
 -        } > $@-t
 -      $(AM_V_at)chmod a+rx $@-t && mv -f $@-t $@
 -
 -# All instspc-*.test tests work by sourcing the `instspc-tests.sh'
 -# script.  Also, they all use shared data generated by the helper
 -# test `instspc-data.test', for reasons of speed.
 -instspc-data.log: instspc-tests.sh
 -$(instspc_tests:.test=.log): instspc-tests.sh instspc-data.log
 -
 -MAINTAINERCLEANFILES += $(instspc_tests)
 -EXTRA_DIST += instspc-tests.sh
 -XFAIL_TESTS += $(instspc_xfail_tests)
 -
 -
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.
  AM_TESTS_ENVIRONMENT = \

diff --cc tests/Makefile.in
index 21ee6ad,55355cc..e2d3af8
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -295,33 -278,88 +295,34 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -TEST_EXTENSIONS = .test .tap
 +
 +# Run the tests with the shell detected at configure time.
 +LOG_COMPILER = $(SHELL)
 +TEST_EXTENSIONS = .test .tap .test_pt .test_cs .test_pltap .tap_pltap
 +TEST_LOG_COMPILER = $(LOG_COMPILER)
 +TAP_LOG_COMPILER = $(LOG_COMPILER)
  TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
 -AM_TAP_LOG_DRIVER_FLAGS = --merge
 -MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
 -EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
 -      $(TESTS) tap-functions.sh plain-functions.sh \
 -      trivial-test-driver testsuite-summary-checks.sh \
 -      extract-testsuite-summary tap-setup.sh tap-summary-aux.sh
 -XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
 -      override-conditional-2.test pr8365-remake-timing.test \
 -      yacc-dist-nobuild-subdir.test vala-vpath.test txinfo5.test \
 -      $(instspc_xfail_tests)
 -parallel_tests = check-concurrency-bug9245-p.test \
 -      check-exported-srcdir-p.test check-fd-redirect-p.test \
 -      check-tests-in-builddir-p.test check-p.test check11-p.test \
 -      check12-p.test check2-p.test check3-p.test check4-p.test \
 -      check5-p.test check6-p.test check7-p.test check8-p.test \
 -      check9-p.test color-p.test color2-p.test comment9-p.test \
 -      dejagnu-p.test exeext4-p.test maken3-p.test maken4-p.test \
 -      posixsubst-tests-p.test tests-environment-p.test
 -instspc_tests = instspc-squote-build.test instspc-squote-install.test \
 -      instspc-dquote-build.test instspc-dquote-install.test \
 -      instspc-bquote-build.test instspc-bquote-install.test \
 -      instspc-sharp-build.test instspc-sharp-install.test \
 -      instspc-dollar-build.test instspc-dollar-install.test \
 -      instspc-bang-build.test instspc-bang-install.test \
 -      instspc-bslash-build.test instspc-bslash-install.test \
 -      instspc-ampersand-build.test instspc-ampersand-install.test \
 -      instspc-percent-build.test instspc-percent-install.test \
 -      instspc-leftpar-build.test instspc-leftpar-install.test \
 -      instspc-rightpar-build.test instspc-rightpar-install.test \
 -      instspc-pipe-build.test instspc-pipe-install.test \
 -      instspc-caret-build.test instspc-caret-install.test \
 -      instspc-tilde-build.test instspc-tilde-install.test \
 -      instspc-qmark-build.test instspc-qmark-install.test \
 -      instspc-star-build.test instspc-star-install.test \
 -      instspc-plus-build.test instspc-plus-install.test \
 -      instspc-minus-build.test instspc-minus-install.test \
 -      instspc-comma-build.test instspc-comma-install.test \
 -      instspc-colon-build.test instspc-colon-install.test \
 -      instspc-semicol-build.test instspc-semicol-install.test \
 -      instspc-equal-build.test instspc-equal-install.test \
 -      instspc-less-build.test instspc-less-install.test \
 -      instspc-more-build.test instspc-more-install.test \
 -      instspc-at-build.test instspc-at-install.test \
 -      instspc-lqbrack-build.test instspc-lqbrack-install.test \
 -      instspc-rqbrack-build.test instspc-rqbrack-install.test \
 -      instspc-lcbrack-build.test instspc-lcbrack-install.test \
 -      instspc-rcbrack-build.test instspc-rcbrack-install.test \
 -      instspc-space-build.test instspc-space-install.test \
 -      instspc-tab-build.test instspc-tab-install.test \
 -      instspc-linefeed-build.test instspc-linefeed-install.test \
 -      instspc-backspace-build.test instspc-backspace-install.test \
 -      instspc-formfeed-build.test instspc-formfeed-install.test \
 -      instspc-carriageret-build.test \
 -      instspc-carriageret-install.test \
 -      instspc-quadrigraph0-build.test \
 -      instspc-quadrigraph0-install.test \
 -      instspc-quadrigraph1-build.test \
 -      instspc-quadrigraph1-install.test \
 -      instspc-quadrigraph2-build.test \
 -      instspc-quadrigraph2-install.test \
 -      instspc-quadrigraph3-build.test \
 -      instspc-quadrigraph3-install.test \
 -      instspc-quadrigraph4-build.test \
 -      instspc-quadrigraph4-install.test instspc-a_b-build.test \
 -      instspc-a_b-install.test instspc-a__b-build.test \
 -      instspc-a__b-install.test instspc-a_lf_b-build.test \
 -      instspc-a_lf_b-install.test instspc-dotdotdot-build.test \
 -      instspc-dotdotdot-install.test instspc-dosdrive-build.test \
 -      instspc-dosdrive-install.test instspc-miscglob1-build.test \
 -      instspc-miscglob1-install.test instspc-miscglob2-build.test \
 -      instspc-miscglob2-install.test
 -instspc_xfail_tests = instspc-squote-build.test \
 -      instspc-dquote-build.test instspc-bquote-build.test \
 -      instspc-sharp-build.test instspc-dollar-build.test \
 -      instspc-bslash-build.test instspc-ampersand-build.test \
 -      instspc-linefeed-build.test instspc-quadrigraph0-build.test \
 -      instspc-a_lf_b-build.test instspc-squote-install.test \
 -      instspc-dquote-install.test instspc-bquote-install.test \
 -      instspc-sharp-install.test instspc-dollar-install.test \
 -      instspc-linefeed-install.test instspc-a_lf_b-install.test
 +AM_TAP_LOG_DRIVER_FLAGS = --merge --comments --diagnostic-string \
 +      `printf '\043%%\043\n'`
 +EXTRA_DIST = ChangeLog-old $(handwritten_TESTS) gen-wrap-tests \
 +      wrap-tests.sh trivial-test-driver testsuite-summary-checks.sh \
 +      extract-testsuite-summary tap-setup.sh tap-summary-aux.sh \
 +      tap-functions.sh plain-functions.sh
 +
 +# Hand-written tests.
 +
 +# "Auto-generated" tests wrapping hand-written ones.
 +TESTS = $(handwritten_TESTS) $(wrap_TESTS)
 +XFAIL_TESTS = \
 +all.test \
 +cond17.test \
 +gcj6.test \
 +override-conditional-2.test \
 +pr8365-remake-timing.test \
 +yacc-dist-nobuild-subdir.test \
++vala-vpath.test \
 +txinfo5.test
 +
  
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.

diff --cc tests/amhello-binpkg.test
Simple merge