Merge branch 'test-protocols' into tap-testsuite-work

* test-protocols:
  test defs: more environment cleanup
  test harness: more minor VPATH-rewrite issues
  test harness: "make -n check" works correctly with Solaris make

diff --cc ChangeLog
Simple merge

diff --cc lib/Automake/tests/Makefile.in
index ab25bfedf997ea6c968f8875d36fdf7fe3895ed1,fff8f6e2ee5dcf949a59bd9cdd7da2e11b8a00e6..582294cb9e757596a376ce9f8e9f12e399fd7cec
--- 1/lib/Automake/tests/Makefile.in
--- 2/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@@ -660,60 -657,17 +667,61 @@@ uninstall-am
  .MAKE: check-am check-html install-am install-strip recheck \
        recheck-html
  
- .PHONY: all all-am check check-TESTS check-am check-html clean \
-       clean-generic clean-local distclean distclean-generic distdir \
-       dvi dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am ps ps-am recheck recheck-html uninstall uninstall-am
+ .PHONY: all all-am am--redo-logs check check-TESTS check-am check-html \
 -      clean clean-generic distclean distclean-generic distdir dvi \
 -      dvi-am html html-am info info-am install install-am \
 -      install-data install-data-am install-dvi install-dvi-am \
 -      install-exec install-exec-am install-html install-html-am \
 -      install-info install-info-am install-man install-pdf \
 -      install-pdf-am install-ps install-ps-am install-strip \
 -      installcheck installcheck-am installdirs maintainer-clean \
 -      maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 -      pdf-am ps ps-am recheck recheck-html uninstall uninstall-am
 -
++      clean clean-generic clean-local distclean distclean-generic \
++      distdir dvi dvi-am html html-am info info-am install \
++      install-am install-data install-data-am install-dvi \
++      install-dvi-am install-exec install-exec-am install-html \
++      install-html-am install-info install-info-am install-man \
++      install-pdf install-pdf-am install-ps install-ps-am \
++      install-strip installcheck installcheck-am installdirs \
++      maintainer-clean maintainer-clean-generic mostlyclean \
++      mostlyclean-generic pdf pdf-am ps ps-am recheck recheck-html \
++      uninstall uninstall-am
 +
 +
 +.PHONY: maintainer-check-list-of-tests
 +maintainer-check-list-of-tests:
 +       @if diff -u /dev/null /dev/null >/dev/null 2>&1; then \
 +         diff='diff -u'; \
 +       else \
 +         diff='diff'; \
 +       fi; \
 +       set X $(checked_test_extensions); shift; \
 +       if test $$# -eq 0; then \
 +         set X $(TEST_EXTENSIONS); shift; \
 +       fi; \
 +       if test $$# -eq 0; then \
 +         echo '$@: internal error: $$(checked_test_extensions) and' \
 +              '$$(TEST_EXTENSIONS) are both undefined or empty' >&2; \
 +         exit 255; \
 +       fi; \
 +       lst='$(expected_list_of_tests)'; \
 +       test -n "$$lst" || lst='$(TESTS)'; \
 +       for t in $$lst; do \
 +         echo "$$t"; \
 +       done | sort >$(am__tmk); \
 +       for ext in $$*; do \
 +         ls *$$ext 2>/dev/null; \
 +         if test $(srcdir) != $(builddir); then \
 +           (cd $(srcdir) && ls *$$ext 2>/dev/null); \
 +         fi; \
 +       done | sort | uniq >$(am__tfs); \
 +       if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \
 +          result=0; \
 +       else \
 +          echo '$@: list of tests in Makefile an on filesystem differ' >&2; \
 +          echo "+ $$diff in-makefile on-filesystem" >&2; \
 +          cat $(am__tdf) >&2; \
 +          result=1; \
 +       fi; \
 +       rm -f $(am__tmk) $(am__tfs) $(am__tdf); \
 +       exit $$result;
 +
 +.PHONY: clean-maintcheck-testslist-tmp
 +clean-local: clean-maintcheck-testslist-tmp
 +clean-maintcheck-testslist-tmp:
 +      rm -f $(am__tmk) $(am__tfs) $(am__tdf)
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/defs
Simple merge