qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
	"open list:Block layer core" <qemu-block@nongnu.org>,
	"Max Reitz" <mreitz@redhat.com>,
	"Claudio Fontana" <cfontana@suse.de>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH  v1 6/6] iotests: Work around failing readlink -f
Date: Mon, 14 Sep 2020 16:07:16 +0100	[thread overview]
Message-ID: <20200914150716.10501-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200914150716.10501-1-alex.bennee@linaro.org>

From: Max Reitz <mreitz@redhat.com>

On macOS, (out of the box) readlink does not have -f.  If the recent
"readlink -f" call introduced by b1cbc33a397 fails, just fall back to
the old behavior (which means you can run the iotests only from the
build tree, but that worked fine for six years, so it should be fine
still).

Keep any potential error message on stderr.  If users want to run the
iotests from outside the build tree, this may point them to what's wrong
(with their system).

Fixes: b1cbc33a3971b6bb005d5ac3569feae35a71de0f
       ("iotests: Allow running from different directory")
Reported-by: Claudio Fontana <cfontana@suse.de>
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200914113809.63640-1-mreitz@redhat.com>
---
 tests/qemu-iotests/check | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index e14a1f354dd9..75675e1a18f0 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -45,6 +45,10 @@ then
     fi
     source_iotests=$(cd "$source_iotests"; pwd) || _init_error "failed to enter source tree"
     build_iotests=$(readlink -f $(dirname "$0"))
+    if [ "$?" -ne 0 ]; then
+        # Perhaps -f is unsupported, revert to pre-b1cbc33a397 behavior
+        build_iotests=$PWD
+    fi
 else
     # called from the source tree
     source_iotests=$PWD
-- 
2.20.1



  parent reply	other threads:[~2020-09-14 15:11 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-14 15:07 [PATCH v1 0/6] deprecation and linux-user tweaks (+test fix) Alex Bennée
2020-09-14 15:07 ` [PATCH v1 1/6] linux-user: test, don't assert addr != test in pgb_reserved_va Alex Bennée
2020-09-14 15:07   ` [Bug 1895080] " Alex Bennée
2020-09-14 15:07 ` [PATCH v1 2/6] configure: use add_to for tweaking deprecated_features Alex Bennée
2020-09-14 16:14   ` Thomas Huth
2020-09-14 15:07 ` [PATCH v1 3/6] configure: also skip deprecated targets with target-list-exclude Alex Bennée
2020-09-14 19:17   ` Peter Maydell
2020-09-15  9:22     ` Alex Bennée
2020-09-14 15:07 ` [PATCH v1 4/6] configure: include tilegx-linux-user in the auto-exclude logic Alex Bennée
2020-09-15 12:58   ` Philippe Mathieu-Daudé
2020-09-14 15:07 ` [PATCH v1 5/6] gitlab: create a build-deprecated target Alex Bennée
2020-09-14 15:15   ` Philippe Mathieu-Daudé
2020-09-14 16:16   ` Thomas Huth
2020-09-14 15:07 ` Alex Bennée [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-16 12:26 [PULL 0/8] configure deprecation, linux-user and test fix Alex Bennée
2020-09-16 12:26 ` [PULL 1/8] linux-user: test, don't assert addr != test in pgb_reserved_va Alex Bennée
2020-09-16 12:26   ` [Bug 1895080] " Alex Bennée
2020-09-16 12:26 ` [PULL 2/8] iotests: Drop readlink -f Alex Bennée
2020-09-16 12:26 ` [PULL 3/8] configure: move deprecated feature processing to supported_target Alex Bennée
2020-09-16 12:26 ` [PULL 4/8] configure: also skip deprecated targets with target-list-exclude Alex Bennée
2020-09-16 12:26 ` [PULL 5/8] configure: clean-up the target-list-exclude logic Alex Bennée
2020-09-16 12:26 ` [PULL 6/8] configure: include tilegx-linux-user in the deprecation logic Alex Bennée
2020-09-16 12:26 ` [PULL 7/8] gitlab: create a build-deprecated target Alex Bennée
2020-09-16 12:40   ` Peter Maydell
2020-09-16 13:23     ` Alex Bennée
2020-09-16 13:52       ` Philippe Mathieu-Daudé
2020-09-25 15:54         ` Peter Maydell
2020-09-25 18:34           ` Richard Henderson
2020-09-25 18:47             ` Peter Maydell
2020-09-16 12:26 ` [PULL 8/8] configure: add [lm32|unicore32]-softmmu to deprecation logic Alex Bennée
2020-09-17 19:40 ` [PULL 0/8] configure deprecation, linux-user and test fix Peter Maydell
2020-09-15 13:43 [PATCH v2 0/8] configure deprecation, linux-user and iotest fixes Alex Bennée
2020-09-15 13:43 ` [PATCH v2 1/8] linux-user: test, don't assert addr != test in pgb_reserved_va Alex Bennée
2020-09-15 13:43   ` [Bug 1895080] " Alex Bennée
2020-09-15 15:58   ` Laurent Vivier
2020-09-15 15:58     ` [Bug 1895080] " Laurent Vivier
2020-09-15 17:13   ` Richard Henderson
2020-09-15 13:43 ` [PATCH v2 2/8] iotests: Drop readlink -f Alex Bennée
2020-09-15 17:14   ` Richard Henderson
2020-09-15 13:43 ` [PATCH v2 3/8] configure: move deprecated feature processing to supported_target Alex Bennée
2020-09-15 13:51   ` Michael Tokarev
2020-09-15 13:43 ` [PATCH v2 4/8] configure: also skip deprecated targets with target-list-exclude Alex Bennée
2020-09-15 17:16   ` Richard Henderson
2020-09-15 13:43 ` [PATCH v2 5/8] configure: clean-up the target-list-exclude logic Alex Bennée
2020-09-15 17:17   ` Richard Henderson
2020-09-15 13:43 ` [PATCH v2 6/8] configure: include tilegx-linux-user in the deprecation logic Alex Bennée
2020-09-15 17:17   ` Richard Henderson
2020-09-15 17:47   ` Philippe Mathieu-Daudé
2020-09-15 13:43 ` [PATCH v2 7/8] gitlab: create a build-deprecated target Alex Bennée
2020-09-15 13:43 ` [PATCH v2 8/8] configure: add [lm32|unicore32]-softmmu to deprecation logic Alex Bennée
2020-09-15 17:20   ` Richard Henderson
2020-10-29 12:25   ` Thomas Huth
2020-10-29 14:42     ` Alex Bennée
2020-10-29 15:28       ` Thomas Huth
2020-09-10  3:46 [Bug 1895080] [NEW] pgb_reserved_va: Assertion `addr == test' failed Hansni Bu
2020-09-10  6:18 ` [Bug 1895080] " Laurent Vivier
2020-09-10 19:04 ` [Bug 1895080] [NEW] " Laurent Vivier
2020-09-11  5:57   ` Hansni Bu
2020-09-11  9:34   ` Alex Bennée
2020-09-11  9:38     ` Alex Bennée
2020-09-11 10:18       ` Hansni Bu
2020-09-11 11:54         ` Alex Bennée
2020-09-11 11:54           ` Alex Bennée
2020-09-11 12:32           ` Hansni Bu
2020-09-11 14:47             ` Alex Bennée
2020-09-11 14:47               ` Alex Bennée
2020-09-11  8:30 ` [Bug 1895080] " Alex Bennée
2020-09-11  9:31   ` Hansni Bu
2020-09-11 14:56 ` [RFC PATCH] linux-user: test, don't assert addr != test in pgb_reserved_va Alex Bennée
2020-09-11 14:56   ` [Bug 1895080] Re: pgb_reserved_va: Assertion `addr == test' failed Alex Bennée
2020-09-15  2:09 ` Hansni Bu
2020-11-08  9:43 ` Thomas Huth
2020-12-10  9:17 ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200914150716.10501-7-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=cfontana@suse.de \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).