[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] tests: avoid one last `...` command substitution in 'test-in
From: |
Eric Blake |
Subject: |
Re: [PATCH] tests: avoid one last `...` command substitution in 'test-init.sh' |
Date: |
Fri, 22 Jun 2012 16:17:26 -0600 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120605 Thunderbird/13.0 |
On 06/22/2012 04:13 PM, Stefano Lattarini wrote:
> * t/ax/test-init.sh (me): In the definition of this variable. This
> also shave off a couple of forks, and the need for a sanity check
> only required in fringe situations.
>
> Signed-off-by: Stefano Lattarini <address@hidden>
> ---
> t/ax/test-init.sh | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
> index ca606b5..116d4b1 100644
> --- a/t/ax/test-init.sh
> +++ b/t/ax/test-init.sh
> @@ -26,10 +26,13 @@ set -e
> # Test scripts can override it if they need to (but this should
> # be done carefully).
> if test -z "$me"; then
> - # Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
> - me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.sh$//;s/\.tap$//'` \
> - && test -n "$me" \
> - || { echo "$argv0: failed to define \$me" >&2; exit 99; }
> + # Strip all directory components.
> + me=${argv0##*/}
Should this strip to the last [\\/] instead of /?
> + # Strip test suffix.
> + case $me in
> + *.tap) me=${me%.tap};;
> + *.sh) me=${me%.sh} ;;
> + esac
> fi
>
>
>
--
Eric Blake address@hidden +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature