[PATCH v3] iotests: Drop readlink -f

* [PATCH v3] iotests: Drop readlink -f
@ 2020-09-14 14:56 Max Reitz
  2020-09-14 15:43 ` Thomas Huth
  2020-09-14 16:03 ` Eric Blake
  0 siblings, 2 replies; 6+ messages in thread
From: Max Reitz @ 2020-09-14 14:56 UTC (permalink / raw)
  To: qemu-block
  Cc: Peter Maydell, Thomas Huth, Alex Bennée, qemu-devel, Max Reitz

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)
 else
     # called from the source tree
     source_iotests=$PWD
-- 
2.26.2



^ permalink raw reply related	[flat|nested] 6+ messages in thread