]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: fix TEST_SKIP for test cases with subtests
authorLuca Boccassi <bluca@debian.org>
Wed, 11 Sep 2024 10:01:55 +0000 (12:01 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 11 Sep 2024 11:55:53 +0000 (13:55 +0200)
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

index a8004b38157638d9efd1dd5c5ae921894b2744f0..72bd89410cc50c24f4316fde4dca2e203d521320 100755 (executable)
@@ -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")))