diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 18:21:33 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 18:35:44 +0200 |
commit | 073216069b0f94ce4a92f5a007c953152c896424 (patch) | |
tree | 8ac3d3e4d0da69ad58b8392e68cd164d9d70218b /defs | |
parent | b0df891f28bb86a953e52c31bc782c9a325e8130 (diff) | |
download | automake-073216069b0f94ce4a92f5a007c953152c896424.tar.gz |
tests init: don't bother allowing '$me' to be overridable
We once used that feature in our wrapper tests; but now (and probably
even since commit 'v1.11-1308-g375f23d' of 2011-09-08, "testsuite:
revamp generation of autogenerated tests") it is not needed anymore.
By removing it we can simplify our growingly complex testsuite framework
a little.
* t/ax/test-inist.sh ($me): Do not initialize it here (and only if not
already set), instead ...
* defs-static.in ($me): ... initialize it here unconditionally.
Do not check anymore that $me doesn't come from the environment: that
wouldn't cause any problem now.
Now that '$me' is defined early, prefer it over 'argv0' in early error
messages, both here ...
* defs: ... and here.
* Makefile.am (AM_TESTS_ENVIRONMENT): Do not bother "nullifying" $me
anymore.
* t/self-check-env-sanitize.tap: Adjust.
* t/self-check-me.tap: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'defs')
-rw-r--r-- | defs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -33,7 +33,7 @@ case ${AM_TESTS_REEXEC-yes} in *) # Ensure we can find ourselves. if test ! -f "$argv0"; then - echo "$argv0: unable to find myself" >&2 + echo "$me: unable to find myself: '$argv0'" >&2 exit 99 fi AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC @@ -49,7 +49,7 @@ case ${AM_TESTS_REEXEC-yes} in 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. - 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 |