aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2020-09-15 14:43:11 +0100
committerAlex Bennée <alex.bennee@linaro.org>2020-09-16 10:06:57 +0100
commitb8761cfdd6a1fb0393dc0aa3737f9a01795ae4b0 (patch)
tree6b410e12395c9479a1e9e8a6f12f9fe99ae2a820
parentfb730c8683807d549c4aa8dfc98e3d1d470fd784 (diff)
downloadqemu-b8761cfdd6a1fb0393dc0aa3737f9a01795ae4b0.zip
qemu-b8761cfdd6a1fb0393dc0aa3737f9a01795ae4b0.tar.gz
qemu-b8761cfdd6a1fb0393dc0aa3737f9a01795ae4b0.tar.bz2
iotests: Drop readlink -f
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. ("iotests: Allow running from different directory") Fixes: b1cbc33a3971b6bb005d5ac3569feae35a71de0f Reported-by: Claudio Fontana <cfontana@suse.de> Reported-by: Thomas Huth <thuth@redhat.com> Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200914145606.94620-1-mreitz@redhat.com> Message-Id: <20200915134317.11110-3-alex.bennee@linaro.org>
-rwxr-xr-xtests/qemu-iotests/check2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index e14a1f3..678b6e4 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)
else
# called from the source tree
source_iotests=$PWD