[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 8/9] iotests: fix source directory location
From: |
John Snow |
Subject: |
[RFC PATCH 8/9] iotests: fix source directory location |
Date: |
Thu, 12 May 2022 20:06:08 -0400 |
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.
(I don't know if this is actually *used*, but what was there was wrong,
I think.)
Signed-off-by: John Snow <jsnow@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..0007da3f06c 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
- Re: [RFC PATCH 3/9] tests: install "qemu" namespace package into venv, (continued)
[RFC PATCH 5/9] tests: use tests/venv to run basevm.py-based scripts, John Snow, 2022/05/12
[RFC PATCH 8/9] iotests: fix source directory location,
John Snow <=
Re: [RFC PATCH 0/9] tests: run python tests under the build/tests/venv environment, Daniel P . Berrangé, 2022/05/13
Re: [RFC PATCH 0/9] tests: run python tests under the build/tests/venv environment, Kevin Wolf, 2022/05/13
Re: [RFC PATCH 0/9] tests: run python tests under the build/tests/venv environment, John Snow, 2022/05/13