Merge branch 'maint'

* maint:
  testsuite: avoid re-running few tests with 'parallel-tests' option
  testsuite: allow tests to avoid the use of 'parallel-tests' option
  tests/README: update obsoleted advice

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.in
index f57d23c,110d13b..5b90af6
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -284,84 -272,39 +284,83 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -XFAIL_TESTS = \
 -all.test \
 -auxdir2.test \
 -cond17.test \
 -gcj6.test \
 -pr8365-remake-timing.test \
 -yacc-dist-nobuild-subdir.test \
 -txinfo5.test
 -
 -parallel_tests = \
 -check-exported-srcdir-p.test \
 -check-tests-in-builddir-p.test \
 -check-tests_environment-p.test \
 -check-p.test \
 -check10-p.test \
 -check11-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
 -
 -MAINTAINERCLEANFILES = $(parallel_tests)
 +MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
 +EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
 +      $(TESTS)
 +XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
 +      override-conditional-2.test pr8365-remake-timing.test \
 +      yacc-dist-nobuild-subdir.test txinfo5.test \
 +      $(instspc_xfail_tests)
 +parallel_tests = backcompat5-p.test check-exported-srcdir-p.test \
 +      check-tests-in-builddir-p.test check-tests_environment-p.test \
 +      check-p.test check10-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 pr401-p.test pr401b-p.test \
-       pr401c-p.test
++      posixsubst-tests-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
  
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.
@@@ -1637,91 -1442,15 +1636,88 @@@ uninstall-am
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
        pdf-am ps ps-am recheck recheck-html uninstall uninstall-am
  
- pr401-p.log: pr401.test
- pr401b-p.log: pr401b.test
- pr401c-p.log: pr401c.test
 +backcompat5-p.log: backcompat5.test
 +check-exported-srcdir-p.log: check-exported-srcdir.test
 +check-tests-in-builddir-p.log: check-tests-in-builddir.test
 +check-tests_environment-p.log: check-tests_environment.test
 +check-p.log: check.test
 +check10-p.log: check10.test
 +check11-p.log: check11.test
 +check12-p.log: check12.test
 +check2-p.log: check2.test
 +check3-p.log: check3.test
 +check4-p.log: check4.test
 +check5-p.log: check5.test
 +check6-p.log: check6.test
 +check7-p.log: check7.test
 +check8-p.log: check8.test
 +check9-p.log: check9.test
 +color-p.log: color.test
 +color2-p.log: color2.test
 +comment9-p.log: comment9.test
 +dejagnu-p.log: dejagnu.test
 +exeext4-p.log: exeext4.test
 +maken3-p.log: maken3.test
 +maken4-p.log: maken4.test
 +posixsubst-tests-p.log: posixsubst-tests.test
  
  $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
 -      (cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
 +      $(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 $@
 +
 +$(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
  
 -$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
 -      input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
 -      sed 's|^\. \./defs.*|parallel_tests=yes; &|' \
 -        < $(srcdir)/$$input >$@
 -      chmod a+rx $@
 +# Each test case depends on defs, aclocal, and automake.
 +$(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION)
  
  clean-local: clean-local-check
  .PHONY: clean-local-check

diff --cc tests/README
Simple merge

diff --cc tests/gen-parallel-tests
index d2a5c13,451fb77..19b0a10
--- 1/tests/gen-parallel-tests
--- 2/tests/gen-parallel-tests
+++ b/tests/gen-parallel-tests
@@@ -31,22 -39,11 +39,21 @@@ grep -v '.-p\.test' 
  LC_ALL=C sort -u |
  while read tst; do
    if grep '^[^#]*parallel-tests' $tst >/dev/null \
-      || grep "parallel_tests=yes" $tst >/dev/null \
-      || grep "parallel_tests=['\"]yes" $tst >/dev/null
+      || grep "parallel_tests=" $tst >/dev/null
    then :; else echo $tst; fi;
  done |
 +sed -e 's/\.test$//' |
  {
    echo "## Generated by gen-parallel-tests.  Edit Makefile.am instead of this."
 -  echo "parallel_tests = \\"
 -  sed 's,\.test$,-p.test,; $!s,$, \\,'
 +  echo "parallel_tests ="
 +  # Since `foo-p.test' sources `foo.test', `foo-p.log' also depends on
 +  # `foo.test'.
 +  sed -e '
 +    h
 +    s/^/parallel_tests += /
 +    s/$/-p.test/
 +    p
 +    x
 +    s/.*/&-p.log: &.test/
 +  '
  }

diff --cc tests/pr401.test
Simple merge

diff --cc tests/pr401b.test
Simple merge

diff --cc tests/pr401c.test
Simple merge