Merge branch 'maint'

* maint:
  tests init: don't bother allowing '$me' to be overridable
  tests init: typofixes in comments

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc Makefile.am
Simple merge

diff --cc defs
index 72dcf63,143be66..087dc67
--- 1/defs
--- 2/defs
+++ b/defs
@@@ -48,8 -48,8 +48,8 @@@ case ${AM_TESTS_REEXEC-yes} i
      esac
      echo exec $AM_TEST_RUNNER_SHELL $opts "$argv0" "$*"
      exec $AM_TEST_RUNNER_SHELL $opts "$argv0" ${1+"$@"}
 -    # This should be dead code, unless some strange error happened. 
 +    # This should be dead code, unless some strange error happened.
-     echo "$argv0: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2
+     echo "$me: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2
      exit 99
      ;;
  esac

diff --cc t/ax/test-init.sh
Simple merge