This gives us better error messages when QEMU startup fails, allows us to drop the extra_args key and allows suppressing Labgrid -display/-nographic option fixups.
Signed-off-by: Ahmad Fatoum <a.fat...@barebox.org> --- Documentation/boards/emulated.rst | 6 ++++++ test/Containerfile | 2 +- test/strategy.py | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Documentation/boards/emulated.rst b/Documentation/boards/emulated.rst index 99c55d2051c2..44e78eef7fe1 100644 --- a/Documentation/boards/emulated.rst +++ b/Documentation/boards/emulated.rst @@ -27,6 +27,12 @@ Labgrid is used to run the barebox test suite, both on real and emulated hardware. A number of YAML files located in ``test/$ARCH`` describe some of the virtualized targets that barebox is known to run on. +barebox makes use of recent labgrid features, so you may need to install +it directly from PyPI instead of your distro's package repositories:: + + pipx install pytest + pipx inject pytest labgrid + Example usage:: # Run x86 VM runnig the EFI payload from efi_defconfig diff --git a/test/Containerfile b/test/Containerfile index 644dc63ad292..fb9bb25bbfc5 100644 --- a/test/Containerfile +++ b/test/Containerfile @@ -92,7 +92,7 @@ RUN echo barebox ALL=NOPASSWD: ALL > /etc/sudoers.d/barebox # install labgrid RUN pip3 install -q --no-cache-dir --break-system-packages \ - git+https://github.com/labgrid-project/labgrid.git@v24.0 && \ + git+https://github.com/labgrid-project/labgrid.git@v25.0 && \ ln -s $(which pytest) /usr/local/bin/labgrid-pytest ENV CROSS_COMPILE_arm=/opt/gcc-${GCC_VERSION}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- diff --git a/test/strategy.py b/test/strategy.py index 9c91720646b5..11406b97f5f1 100644 --- a/test/strategy.py +++ b/test/strategy.py @@ -13,9 +13,9 @@ from labgrid.strategy import Strategy, StrategyError from labgrid.util import labgrid_version match = re.match(r'^(\d+?)\.', labgrid_version()) -if match is None or int(match.group(1)) < 24: +if match is None or int(match.group(1)) < 25: pytest.exit(f"Labgrid has version v{labgrid_version()}, " - f"but barebox test suite requires at least v24.") + f"but barebox test suite requires at least v25.") class Status(enum.Enum): unknown = 0 -- 2.39.5
