[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 2/7] Acceptance tests: keep a stable reference to
From: |
Cleber Rosa |
Subject: |
[Qemu-devel] [PATCH v6 2/7] Acceptance tests: keep a stable reference to the QEMU build dir |
Date: |
Thu, 6 Jun 2019 17:14:09 -0400 |
This is related to the the differences in in-tree and out-of-tree
builds in QEMU. For simplification, <BLD> means my build directory.
Currently, by running a `make check-acceptance` one gets (in
tests/acceptance/avocado_qemu/__init__.py):
SRC_ROOT_DIR: <BLD>/tests/acceptance/avocado_qemu/../../..
This in itself is problematic, because after the parent directories
are applied, one may be left not with a pointer to the build directory
as intended, but with the location of the source tree (assuming they
differ). Built binaries, such as qemu-img, are of course not there and
can't be found.
Given that a Python '__file__' will contain the absolute path to the
file backing the module, say:
__file__: <BLD>/tests/acceptance/avocado_qemu/__init__.py
| 4 | 3 | 2 | 1 |
A solution is to not "evaluate" the third parent dir (marked as 4
here) because that ends up following the "tests" directory symlink to
the source tree. In fact, there's no need to keep or evaluate any of
the parent directories, we can just drop the rightmost 4 components,
and we'll keep a stable reference to the build directory (with no
symlink being followed). This works for either a dedicated build
directory or also a combined source and build tree.
Signed-off-by: Cleber Rosa <address@hidden>
---
tests/acceptance/avocado_qemu/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py
b/tests/acceptance/avocado_qemu/__init__.py
index 2b236a1cf0..ac59d36a4c 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -14,7 +14,7 @@ import uuid
import avocado
-SRC_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..', '..')
+SRC_ROOT_DIR =
os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
sys.path.append(os.path.join(SRC_ROOT_DIR, 'python'))
from qemu import QEMUMachine
--
2.21.0
- [Qemu-devel] [PATCH v6 0/7] Add "boot_linux" acceptance test, Cleber Rosa, 2019/06/06
- [Qemu-devel] [PATCH v6 2/7] Acceptance tests: keep a stable reference to the QEMU build dir,
Cleber Rosa <=
- [Qemu-devel] [PATCH v6 7/7] [RFC]: use Avocado data drainer for console logging, Cleber Rosa, 2019/06/06
- [Qemu-devel] [PATCH v6 1/7] Acceptance tests: use relative location for tests, Cleber Rosa, 2019/06/06
- [Qemu-devel] [PATCH v6 4/7] Acceptance tests: depend on qemu-img, Cleber Rosa, 2019/06/06
- [Qemu-devel] [PATCH v6 6/7] Add "boot_linux" test for aarch64 and virt machine type, Cleber Rosa, 2019/06/06
- [Qemu-devel] [PATCH v6 3/7] Acceptance tests: add the build directory to the system PATH, Cleber Rosa, 2019/06/06
- [Qemu-devel] [PATCH v6 5/7] Add "boot_linux" test for x86_64 and pc and q35 machine types, Cleber Rosa, 2019/06/06
- Re: [Qemu-devel] [PATCH v6 0/7] Add "boot_linux" acceptance test, no-reply, 2019/06/07