31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
|
From 6178aa4bbcc6b0531314c1a2e9df61e45e6c9ad4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luca Boccassi <bluca@debian.org>
|
||
|
|
Date: Mon, 17 Jun 2024 14:09:40 +0100
|
||
|
|
Subject: [PATCH] test: support TEST_NO_QEMU in mkosi integration wrapper
|
||
|
|
|
||
|
|
Same as the old integration test suite, allow skipping tests that
|
||
|
|
require qemu.
|
||
|
|
ppc64el's vsock support doesn't appear to work, so we'll skip it,
|
||
|
|
as it is already done in the legacy framework.
|
||
|
|
|
||
|
|
(cherry picked from commit 464d182b3e470e4163ca376145539a537a6e43a2)
|
||
|
|
---
|
||
|
|
test/integration-test-wrapper.py | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
|
||
|
|
index 15b1ce1055..b6a16aa3ef 100755
|
||
|
|
--- a/test/integration-test-wrapper.py
|
||
|
|
+++ b/test/integration-test-wrapper.py
|
||
|
|
@@ -57,6 +57,10 @@ def main():
|
||
|
|
print(f"SYSTEMD_SLOW_TESTS=1 not found in environment, skipping {args.name}", file=sys.stderr)
|
||
|
|
exit(77)
|
||
|
|
|
||
|
|
+ if args.vm and bool(int(os.getenv("TEST_NO_QEMU", "0"))):
|
||
|
|
+ print(f"TEST_NO_QEMU=1, skipping {args.name}", file=sys.stderr)
|
||
|
|
+ exit(77)
|
||
|
|
+
|
||
|
|
name = args.name + (f"-{i}" if (i := os.getenv("MESON_TEST_ITERATION")) else "")
|
||
|
|
|
||
|
|
dropin = textwrap.dedent(
|