[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3] iotests: Drop readlink -f
From: |
Peter Maydell |
Subject: |
Re: [PATCH v3] iotests: Drop readlink -f |
Date: |
Mon, 14 Sep 2020 17:03:17 +0100 |
On Mon, 14 Sep 2020 at 16:43, Thomas Huth <thuth@redhat.com> wrote:
>
> On 14/09/2020 16.56, Max Reitz wrote:
> > On macOS, (out of the box) readlink does not have -f. We do not really
> > need readlink here, though, it was just a replacement for realpath
> > (which is not available on our BSD test systems), which we needed to
> > make the $(dirname) into an absolute path.
> >
> > Instead of using either, just use "cd; pwd" like is done for
> > $source_iotests.
> >
> > Fixes: b1cbc33a3971b6bb005d5ac3569feae35a71de0f
> > ("iotests: Allow running from different directory")
> > Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> > Reported-by: Claudio Fontana <cfontana@suse.de>
> > Reported-by: Thomas Huth <thuth@redhat.com>
> > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > ---
> > tests/qemu-iotests/check | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> > index e14a1f354d..678b6e4910 100755
> > --- a/tests/qemu-iotests/check
> > +++ b/tests/qemu-iotests/check
> > @@ -44,7 +44,7 @@ then
> > _init_error "failed to obtain source tree name from check symlink"
> > fi
> > source_iotests=$(cd "$source_iotests"; pwd) || _init_error "failed to
> > enter source tree"
> > - build_iotests=$(readlink -f $(dirname "$0"))
> > + build_iotests=$(cd "$(dirname "$0")"; pwd)
>
> I assume the nested quotes are ok here? ... shell scripts always confuse
> me in that regard...
Yes, the quoting is right here
(cf
https://unix.stackexchange.com/questions/118433/quoting-within-command-substitution-in-bash)
-- $() creates a new quoting context and within it you quote
the command the same way you would if it were a standalone
commandline.
thanks
-- PMM