Chores for v257 (#35525)

test/README.testsuite

@@ -147,6 +147,10 @@ that make use of `run_testcases`.
 
 `TEST_SKIP`: takes a space separated list of tests to skip.
 
+`TEST_SKIP_SUBTEST=subtest`: takes a space separated list of subtests to skip.
+
+`TEST_SKIP_TESTCASE=testcase`: takes a space separated list of testcases to skip.
+
 ## Ubuntu CI
 
 New PRs submitted to the project are run through regression tests, and one set

test/TEST-86-MULTI-PROFILE-UKI/meson.build

@@ -6,5 +6,6 @@ integration_tests += [
                 'storage' : 'persistent',
                 'vm' : true,
                 'firmware' : 'auto',
+                'enabled' : false,
         },
 ]

test/units/TEST-07-PID1.sh

@@ -10,6 +10,7 @@ set -o pipefail
 # See TEST-07-PID1/test.sh for the first "half" of the test
 mountpoint /issue2730
 
+export TEST_SKIP_SUBTESTS="private-pids"
 run_subtests
 
 touch /testok

test/units/TEST-13-NSPAWN.sh

@@ -13,6 +13,7 @@ fi
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
+export TEST_SKIP_SUBTESTS="nspawn machined"
 run_subtests
 
 touch /testok

test/units/test-control.sh

@@ -91,6 +91,13 @@ run_subtests_with_signals() {
             continue
         fi
 
+        for skip in ${TEST_SKIP_SUBTESTS:-}; do
+            if [[ "$subtest" =~ $skip ]]; then
+                echo "Skipping $subtest (matching '$skip')"
+                continue 2
+            fi
+        done
+
         : "--- $subtest BEGIN ---"
         SECONDS=0
         "./$subtest" &
@@ -123,6 +130,13 @@ run_subtests() {
             continue
         fi
 
+        for skip in ${TEST_SKIP_SUBTESTS:-}; do
+            if [[ "$subtest" =~ $skip ]]; then
+                echo "Skipping $subtest (matching '$skip')"
+                continue 2
+            fi
+        done
+
         : "--- $subtest BEGIN ---"
         SECONDS=0
         if ! "./$subtest"; then
@@ -155,6 +169,13 @@ run_testcases() {
             continue
         fi
 
+        for skip in ${TEST_SKIP_TESTCASES:-}; do
+            if [[ "$testcase" =~ $skip ]]; then
+                echo "Skipping $testcase (matching '$skip')"
+                continue 2
+            fi
+        done
+
         : "+++ $testcase BEGIN +++"
         # Note: the subshell here is used purposefully, otherwise we might
         #       unexpectedly inherit a RETURN trap handler from the called