Merge branch 'maint'

diff --cc ChangeLog
index 21acbc1,bdb49db..7e97a4a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,11 +1,30 @@@
  2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       test defs: allow overriding of `$me'
+       * tests/defs.in ($me): Allow overriding by the including test
+       script.  Add some explicative comments.
+ 
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
 +      coverage: more tests on the parallel-tests driver
 +      * tests/parallel-tests-interrupt.test: New test.
 +      * tests/parallel-tests-reset-term.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      check: new developer-reserved AM_TESTS_SETUP variable
 +      For reference, see the discussion at:
 +      <http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00213.html>
 +      * lib/am/check.am [%?PARALLEL_TESTS%] (am__check_pre): Pass also
 +      $(AM_TESTS_SETUP).  Comments updated, and some typos fixed.
 +      * doc/automake.texi (Simple Tests using parallel-tests): Document
 +      AM_TESTS_SETUP.  Reorder some of the existing documentation a bit.
 +      * tests/parallel-tests-am_tests_setup.test: New test.
 +      From a suggestion by Ralf Wildenhues.
 +
 +2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
        depcomp tests: don't reject slower dependency extractors
        * tests/depcomp8b.test: Add the `--enable-dependency-tracking'
        option to `configure' invocations, so that slower dependency

diff --cc tests/defs
index f67491a,38bb4e5..ae05b82
--- 1/tests/defs
--- 2/tests/defs.in
+++ b/tests/defs
@@@ -17,32 -17,23 +17,35 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Defines for Automake testing environment.
 -# Tom Tromey <tromey@cygnus.com>
 -
 -# Be more Bourne compatible.
 -# (Snippet copied from configure's initialization in Autoconf 2.64)
 -DUALCASE=1; export DUALCASE # for MKS sh
 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 -  emulate sh
 -  NULLCMD=:
 -  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 -  # is contrary to our usage.  Disable this feature.
 -  alias -g '${1+"$@"}'='"$@"'
 -  setopt NO_GLOB_SUBST
 -else
 -  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 +## -------------------------------------------------------- ##
 +##  Source static setup and definitions for the testsuite.  ##
 +## -------------------------------------------------------- ##
 +
 +# This code needs to be 'set -e' clean.
 +
 +# Ensure we are running from the right directory.
 +test -f ./defs-static || {
 +   echo "$0: ./defs-static: not found in current directory" >&2
 +   exit 99
 +}
 +
 +# Source the shell sanitization and variables' definitions.
 +. ./defs-static || exit 99
 +
- # The name of the current test (without the `.test' suffix.)
- # Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
- me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'` \
-   && test -n "$me" \
-   || { echo "$argv0: failed to define \$me" >&2; exit 99; }
- 
++# The name of the current test (without the `.test' suffix).
++# Test scripts can override it if they need to (but this should
++# be done carefully, and *before* including ./defs).
++if test -z "$me"; then
++  # Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
++  me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'` \
++    && test -n "$me" \
++    || { echo "$argv0: failed to define \$me" >&2; exit 99; }
+ fi
  
 +## ---------------------------------------- ##
 +##  Sanity checks and environment cleanup.  ##
 +## ---------------------------------------- ##
 +
  # A single whitespace character.
  sp=' '
  # A tabulation character.