From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Kevin Wolf <kwolf@redhat.com>,
Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH] iotests: fix source directory location
Date: Wed, 25 May 2022 20:25:12 -0400 [thread overview]
Message-ID: <20220526002512.1585246-1-jsnow@redhat.com> (raw)
If you invoke the check script from outside of the tests/qemu-iotests
directory, the directories initialized as source_iotests and
build_iotests will be incorrect.
We can use the location of the source file itself to be more accurate.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qemu-iotests/testenv.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index a864c74b123..9b0f01e84db 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -217,10 +217,10 @@ def __init__(self, imgfmt: str, imgproto: str, aiomode: str,
self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0]))
else:
# called from the source tree
- self.source_iotests = os.getcwd()
+ self.source_iotests = str(Path(__file__, '..').resolve())
self.build_iotests = self.source_iotests
- self.build_root = os.path.join(self.build_iotests, '..', '..')
+ self.build_root = str(Path(self.build_iotests, '../..').resolve())
self.init_directories()
self.init_binaries()
--
2.34.1
next reply other threads:[~2022-05-26 0:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 0:25 John Snow [this message]
2022-05-26 7:54 ` [PATCH] iotests: fix source directory location Daniel P. Berrangé
2022-05-26 14:21 ` John Snow
2022-05-26 15:20 ` John Snow
2022-05-26 15:23 ` Daniel P. Berrangé
2022-05-27 16:29 ` Kevin Wolf
2022-07-11 21:30 ` John Snow
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=20220526002512.1585246-1-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).