Merge branch 'master' into ng/master

* master: (29 commits)
  tests: avoid wrong skips in dist-formats.tap
  tests: few tweakings and cosmetic changes
  tests: remove a couple of redundant 'set -e' calls
  tests: check if 'compress' is real or fake
  depcomp tests: avoid spurious failures with 'dashXmstdout' depmode
  depcomp: try to prevent whitespace regressions
  depcomp: recognize tabs as whitespace in the dashmstdout mode
  depcomp: quote 'like this', not `like this'
  tests: check the depmodes 'msvisualcpp' and 'msvcmsys'
  tests: better way to compare lists in Makefile rules
  tests: improve and rework tests on dependency tracking
  tests: fix a timestamp-related spurious failures
  dryrun: fix regression with '$(am__make_dryrun)'
  test defs: avoid spurious XPASS results with NetBSD make
  cosmetics: few whitespace fixlets
  cosmetics: various typofixes
  cosmetics: convert encoding from ISO-8859 to UTF-8 in some tests
  test defs: remove obsolete requirement 'rst2html'
  tests: workaround for shells with broken 'set -e'
  cosmetics: fix a typo in comments
  ...

diff --cc doc/automake.texi
Simple merge

diff --cc lib/am/check.am
index c6d9a18dbd97c82e727a7fa03482760c67c87bf8,777cb6ffcd18726664cdd911760f8772ebd361b2..9cb3b76a41d2c2eabf9686ca3bd50e9b295781cf
--- 1/lib/am/check.am
--- 2/lib/am/check.am
+++ b/lib/am/check.am
@@@ -127,38 -127,8 +127,8 @@@ am__set_TESTS_bases = 
  # to avoid problems with "make -n".
  .log.trs:
        rm -f $< $@
 -      $(MAKE) $(AM_MAKEFLAGS) $<
 +      $(MAKE) $<
  
- # Helper recipe used by $(TEST_SUITE_LOG) below, to avoid problems with
- # "make -n".  Break this recipe in multiple shell invocations too, to
- # really work as expected with "make -n".
- am--redo-logs:
-       @rm -f $$redo_logs
-       @rm -f $$redo_results
- ## The use of the `am__remaking_logs' environment variable below is
- ## required to ensure that we don't go into an infinite recursion in
- ## case a test log in $(TEST_LOGS) is the same as $(TEST_SUITE_LOG).
- ## Yes, this has already happened in practice.  Sigh!
-       @if test -n "$$am__remaking_logs"; then \
-         echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-              "recursion detected" >&2; \
-       else \
-         am__remaking_logs=yes $(MAKE) $$redo_logs; \
-       fi;
- ## Sanity check: each unreadable or non-existent test result file should
- ## has been properly remade at this point, as should the corresponding log
- ## file.
-       @st=0;  \
-       errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-       for i in $$redo_bases; do \
-         test -f $$i.trs && test -r $$i.trs \
-           || { echo "$$errmsg $$i.trs"; st=1; }; \
-         test -f $$i.log && test -r $$i.log \
-           || { echo "$$errmsg $$i.log"; st=1; }; \
-       done; \
-       test $$st -eq 0
- .PHONY: am--redo-logs
- 
  $(TEST_SUITE_LOG): $(TEST_LOGS)
        @$(am__set_TESTS_bases); \
  ## Helper shell function, tells whether a path refers to an existing,
@@@ -359,15 -361,11 +361,11 @@@ check-TESTS recheck
  ## with the files to recheck, so that those will be rerun by the
  ## "make test-suite.log" recursive invocation below.  But use a proper
  ## hack to avoid extra files removal when running under "make -n".
-       if test $@ = recheck && test -n "$$list"; then \
-         { \
-          echo 'am--clean: am--clean-log am--clean-trs'; \
-          echo 'am--clean-log: ; rm -f $$(am__logs)'; \
-          echo 'am--clean-trs: ; rm -f $$(am__logs:.log=.trs)'; \
-         } | $(MAKE) -f - am--clean am__logs="$$list" \
-           || exit 1; \
+       if test $@ != recheck || $(am__make_dryrun); then :; else \
+         test -z "$$log_list" || rm -f $$log_list; \
+         test -z "$$trs_list" || rm -f $$trs_list; \
        fi; \
-       $(MAKE) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 -      $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"
++      $(MAKE) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"
  
  ## Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc.
  recheck: %CHECK_DEPS%

diff --cc lib/am/distdir.am
Simple merge

diff --cc lib/am/header-vars.am
Simple merge

diff --cc lib/am/lisp.am
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/check8.test
index 97ed250f3ae19d7bdd91653ae69a08d4c670b64a,6906318d4b8dd9bd66c255959cdb816931bfa02f..5476f362f00d5c534591cfc166afca9cc2d8d6d7
--- 1/tests/check8.test
--- 2/tests/check8.test
+++ b/tests/check8.test
@@@ -65,8 -64,8 +65,8 @@@ $AUTOCON
  $AUTOMAKE -a
  
  ./configure
- $MAKE check AM_COLOR_TESTS=always >stdout 2>stderr &&
 -AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr &&
--  { cat stdout; cat stderr >&2; Exit 1; }
++AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr \
++  && { cat stdout; cat stderr >&2; Exit 1; }
  cat stdout
  cat stderr >&2
  grep 'XPASS.* foo$' stdout

diff --cc tests/conffile-leading-dot.test
index d1306be4ba954eb317d21819bee7f6fbcb7c05ef,382124e2546c454a12613fab821d74810a00ebbe..ff582db03066039828db8f2da59f524096f0caa6
--- 1/tests/conffile-leading-dot.test
--- 2/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@@ -18,10 -18,9 +18,8 @@@
  # with a dot (like "./Makefile"), since the remake rules might be subtly
  # broken in that case.
  
 -required=GNUmake
  . ./defs || Exit 1
  
- set -e
- 
  cat > configure.in << END
  AC_INIT([$me], [1.0])
  AM_INIT_AUTOMAKE

diff --cc tests/defs
Simple merge

diff --cc tests/fort2.test
Simple merge

diff --cc tests/gen-testsuite-part
Simple merge

diff --cc tests/list-of-tests.mk
index da40dab749b5f0fe63dec7a746c11ca6b4905067,d2ad678c52f7c79d94f89a8d73e2ffe08880cbd9..03477099b917642b90dafef166bb92dc82bece06
--- 1/tests/list-of-tests.mk
--- 2/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@@ -323,23 -324,14 +322,17 @@@ deleted-m4.test 
  depacl2.test \
  depcomp.test \
  depcomp2.test \
- depcomp3.test \
- depcomp4.test \
- depcomp5.test \
- depcomp6.test \
- depcomp7.test \
  depcomp8a.test \
  depcomp8b.test \
 +depcomp-recover.test \
 +depcomp-shuffle.test \
 +depcomp-shuffle-vpath.test \
 +depcomp-shuffle-sub.test \
 +depcomp-shuffle-sub-vpath.test \
  depdist.test \
  depend.test \
- depend2.test \
  depend3.test \
  depend4.test \
 -depend5.test \
 -depend6.test \
  deprecated-acinit.test \
  destdir.test \
  dirlist.test \

diff --cc tests/parallel-tests-extra-programs.test
Simple merge

diff --cc tests/parallel-tests2.test
Simple merge

diff --cc tests/test-driver-custom-multitest-recheck2.test
index 94d8d3bec1f0ebff89e0888ace8a44e570d91fa5,e7c183d3010c851aee173d5ee238050596e1e7ec..9f15d0e4455409f5a4d6475e5f35387429c27872
--- 1/tests/test-driver-custom-multitest-recheck2.test
--- 2/tests/test-driver-custom-multitest-recheck2.test
+++ b/tests/test-driver-custom-multitest-recheck2.test
@@@ -105,8 -105,9 +105,8 @@@ for vpath in : false; d
    done
    unset var
  
-   : a.test was sucessfull the first time, no need to re-run it.
+   : a.test was successful the first time, no need to re-run it.
 -  env TESTS=a.test $MAKE -e recheck >stdout \
 -    || { cat stdout; Exit 1; }
 +  $MAKE TESTS=a.test recheck >stdout || { cat stdout; Exit 1; }
    cat stdout
    count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
    test ! -r a.run

diff --cc tests/txinfo21.test
Simple merge