diff --git a/test/integration.py b/test/integration.py index dbb1e12..1de16dd 100755 --- a/test/integration.py +++ b/test/integration.py @@ -222,7 +222,9 @@ def run(device, test, runtime, debug): ret = subprocess.call(args) if ret != 0: print(f"Command return non-zero exist status {ret}") - print((tmpdir / "logs.yaml").read_text(encoding="utf-8")) + log = tmpdir / "logs.yaml" + if log.exists(): + print(log.read_text(encoding="utf-8")) return ret results = get_results(tmpdir) @@ -273,9 +275,9 @@ def main(): for d in Device.list(virtual_device=True) if fnmatch.fnmatch(d.name, pat) ] - for qemu in ["qemu-riscv32", "qemu-sh4"]: - if qemu in options.devices: - options.devices.remove(qemu) + for skip in ["fvp-lava", "qemu-lava", "qemu-riscv32", "qemu-sh4"]: + if skip in options.devices: + options.devices.remove(skip) for device in options.devices: tests = options.tests.copy() diff --git a/test/unit/test_main.py b/test/unit/test_main.py index 672986a..26dde34 100644 --- a/test/unit/test_main.py +++ b/test/unit/test_main.py @@ -627,6 +627,7 @@ def test_update_cache(mocker, monkeypatch, capsys): * qemu-armv7 * qemu-armv7be * qemu-i386 + * qemu-lava * qemu-m68k * qemu-mips32 * qemu-mips32el