From 8f4bbd096b27344c65998fafbad9c059ece52146 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 11 Sep 2024 12:01:55 +0200 Subject: [PATCH] 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 --- test/integration-test-wrapper.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py index a8004b3815..72bd89410c 100755 --- a/test/integration-test-wrapper.py +++ b/test/integration-test-wrapper.py @@ -61,9 +61,10 @@ def main(): print(f"TEST_NO_QEMU=1, skipping {args.name}", file=sys.stderr) exit(77) - if args.name in os.getenv("TEST_SKIP", "").split(): - print(f"Skipping {args.name} due to TEST_SKIP", file=sys.stderr) - exit(77) + for s in os.getenv("TEST_SKIP", "").split(): + if s in args.name: + print(f"Skipping {args.name} due to TEST_SKIP", file=sys.stderr) + exit(77) keep_journal = os.getenv("TEST_SAVE_JOURNAL", "fail") shell = bool(int(os.getenv("TEST_SHELL", "0"))) -- 2.25.1