Merge branch 'master' into testsuite-work

* master:
  fix typo in recent ChangeLog entry
  docs, tests: synchronize examples on silent-rules from config.site
  tests: fix weakness in 'tests-environment-backcompat.test'

diff --cc ChangeLog
index 73077c7,42687cf..e42c3e3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,51 -1,19 +1,65 @@@
  2011-07-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       tests: fix weakness in 'tests-environment-backcompat.test'
+       * tests/tests-environment-backcompat.test: Do not override the
+       content of xfailing test `baz.test' with a "weaker" version that
+       fails unconditionally: the test must fail only when the 'strict'
+       pragma is in use, in order not to reduce coverage.
+ 
+ 2011-07-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs, tests: synchronize examples on silent-rules from config.site
+       * doc/automake.texi (Automake silent-rules Option): Reference test
+       'silent-configsite.test' in comments.
+ 
+ 2011-07-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
 +      tests defs: more uses of $top_testsrcdir
 +      * tests/autodist-stamp-vti.test: Use `$top_testsrcdir' instead
 +      of `$testsrcdir/..'.
 +      * tests/repeated-options.test: Likewise.
 +      * tests/suffix5.test: Likewise.
 +      * tests/vtexi3.test: Likewise.
 +
 +2011-07-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      self tests: fix typo in comment
 +      * tests/self-check-exit.test: Fix typo in heading comments.
 +
 +2011-07-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: remove redundant settings of `errexit' shell flag
 +      * tests/amhello-binpkg.test: Do not set the `errexit' shell
 +      flag, as it is already set by `tests/defs'.
 +      * tests/amhello-cflags.test: Likewise.
 +      * tests/amhello-cross-compile.test: Likewise.
 +      * tests/ansi2knr-deprecation.test: Likewise.
 +      * tests/autodist-no-duplicate.test: Likewise.
 +      * tests/distcheck-configure-flags-am.test: Likewise.
 +      * tests/distcheck-configure-flags-subpkg.test: Likewise.
 +      * tests/distcheck-configure-flags.test: Likewise.
 +      * tests/distcheck-hook.test: Likewise.
 +      * tests/distcheck-hook2.test: Likewise.
 +      * tests/parallel-tests-am_tests_environment.test: Likewise.
 +      * tests/parallel-tests-harderror.test: Likewise.
 +      * tests/parallel-tests-log-compiler-example.test: Likewise.
 +      * tests/parallel-tests-log-override-1.test: Likewise.
 +      * tests/parallel-tests-log-override-2.test: Likewise.
 +      * tests/parallel-tests-log-override-recheck.test: Likewise.
 +      * tests/primary-prefix-couples-documented-valid.test: Likewise.
 +      * tests/primary-prefix-couples-force-valid.test: Likewise.
 +      * tests/primary-prefix-invalid-couples.test: Likewise.
 +      * tests/primary-prefix-valid-couples.test: Likewise.
 +      * tests/remake-subdir-from-subdir.test: Likewise.
 +      * tests/remake-subdir-gnu.test: Likewise.
 +      * tests/remake-subdir-long-time.test: Likewise.
 +      * tests/remake-subdir.test: Likewise.
 +      * tests/remake-subdir2.test: Likewise.
 +      * tests/silent-configsite.test: Likewise.
 +      * tests/tests-environment-backcompat.test: Likewise.
 +
 +2011-07-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
        tests: portability fixes in tests on amhello examples
        * tests/amhello-binpkg.test: Don't use "tar xzf too.tag.gz" to
        extract a gzip-compressed tarball, that's unportable to some

diff --cc tests/tests-environment-backcompat.test
Simple merge