1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-10 16:58:28 +03:00

test: fix TEST_SKIP for test cases with subtests

TEST-64-UDEV-STORAGE is invoked with the subtest appended, so TEST_SKIP=TEST-64-UDEV-STORAGE
does not work. Fix it by using TEST_SKIP as a partial match.

Follow-up for ddc91af4eaa32511f92c83b2c24d9cc0425fd5f5

(cherry picked from commit 8f4bbd096b27344c65998fafbad9c059ece52146)
This commit is contained in:
Luca Boccassi 2024-09-11 12:01:55 +02:00 committed by Luca Boccassi
parent 9d2e086ab4
commit 99fdc0ab68

View File

@ -61,9 +61,10 @@ def main():
print(f"TEST_NO_QEMU=1, skipping {args.name}", file=sys.stderr) print(f"TEST_NO_QEMU=1, skipping {args.name}", file=sys.stderr)
exit(77) exit(77)
if args.name in os.getenv("TEST_SKIP", "").split(): for s in os.getenv("TEST_SKIP", "").split():
print(f"Skipping {args.name} due to TEST_SKIP", file=sys.stderr) if s in args.name:
exit(77) print(f"Skipping {args.name} due to TEST_SKIP", file=sys.stderr)
exit(77)
keep_journal = os.getenv("TEST_SAVE_JOURNAL", "fail") keep_journal = os.getenv("TEST_SAVE_JOURNAL", "fail")
shell = bool(int(os.getenv("TEST_SHELL", "0"))) shell = bool(int(os.getenv("TEST_SHELL", "0")))