selftests/cgroup: set the test plan after the setup checks
Subsystems (6)
PATCH 1/1 selftests/cgroup: set the test plan after the setup checks
The cgroup tests announce their plan before checking whether cgroup v2 is available, so on a host without it they promise a number of results and then skip out after the first one:
TAP version 13 1..3 ok 1 # SKIP cgroup v2 isn't mounted # Planned tests != run tests (3 != 1) # Totals: pass:0 fail:0 xfail:0 xpass:0 skip:1 error:0
ksft_exit_skip() can only emit a well formed "1..0 # SKIP" line while no plan has been printed, as the comment above it in kselftest.h points out.
Move ksft_set_plan() below the setup checks that can skip, so that a skipped run reports:
TAP version 13
1..0 # SKIP cgroup v2 isn't mounted
Several of the tests skip more than once while setting up, for a missing or unwritable controller as well, so the plan goes after the last of them. test_core joins its two setup paths at the post_v2_setup label and sets the plan there.
Reporting each planned test as skipped instead would keep the plan where it is, but the setup failures here mean the whole test cannot run rather than its individual cases being skipped, which is what "1..0 # SKIP" is for.
--- tools/testing/selftests/cgroup/test_core.c | 2 +- tools/testing/selftests/cgroup/test_cpu.c | 2 +- tools/testing/selftests/cgroup/test_cpuset.c | 2 +- tools/testing/selftests/cgroup/test_freezer.c | 2 +- tools/testing/selftests/cgroup/test_kill.c | 2 +- tools/testing/selftests/cgroup/test_kmem.c | 2 +- tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- tools/testing/selftests/cgroup/test_pids.c | 2 +- tools/testing/selftests/cgroup/test_zswap.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
tools/testing/selftests/cgroup/test_core.c +1 -1
@@ -927,7 +927,6 @@ int main(int argc, char *argv[])int i;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root), &nsdelegate)) {if (setup_named_v1_root (root,sizeof (root),CG_NAMED_NAME ))ksft_exit_skip ("cgroup v2 isn't mounted and could not setup named v1 hierarchy\n" );
@@ -940,6 +939,7 @@ int main(int argc, char *argv[])ksft_exit_skip ("Failed to set memory controller\n" ); post_v2_setup: +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_cpu.c +1 -1
@@ -799,7 +799,6 @@ int main(int argc, char *argv[])int i;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" );
@@ -807,6 +806,7 @@ int main(int argc, char *argv[])if (cg_write (root,"cgroup.subtree_control" ,"+cpu" ))ksft_exit_skip ("Failed to set cpu controller\n" ); +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_cpuset.c +1 -1
@@ -250,7 +250,6 @@ int main(int argc, char *argv[])int i;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" );
@@ -258,6 +257,7 @@ int main(int argc, char *argv[])if (cg_write (root,"cgroup.subtree_control" ,"+cpuset" ))ksft_exit_skip ("Failed to set cpuset controller\n" ); +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_freezer.c +1 -1
@@ -1491,9 +1491,9 @@ int main(int argc, char *argv[])int i;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" ); +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_kill.c +1 -1
@@ -278,9 +278,9 @@ int main(int argc, char *argv[])int i;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" ); +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_kmem.c +1 -1
@@ -426,7 +426,6 @@ int main(int argc, char **argv)int i;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" );
@@ -441,6 +440,7 @@ int main(int argc, char **argv)if (cg_write (root,"cgroup.subtree_control" ,"+memory" ))ksft_exit_skip ("Failed to set memory controller\n" ); +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_memcontrol.c +1 -1
@@ -1798,7 +1798,6 @@ int main(int argc, char **argv) page_size =BUF_SIZE ;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" );
@@ -1823,6 +1822,7 @@ int main(int argc, char **argv)ksft_exit_skip ("Failed to query cgroup mount option\n" ); has_localevents = proc_status; +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_pids.c +1 -1
@@ -148,7 +148,6 @@ int main(int argc, char **argv)char root[PATH_MAX ];ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" );
@@ -163,6 +162,7 @@ int main(int argc, char **argv)if (cg_write (root,"cgroup.subtree_control" ,"+pids" ))ksft_exit_skip ("Failed to set pids controller\n" ); +ksft_set_plan (ARRAY_SIZE (tests));for (int i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
tools/testing/selftests/cgroup/test_zswap.c +1 -1
@@ -810,7 +810,6 @@ int main(int argc, char **argv) page_size =BUF_SIZE ;ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (tests));if (cg_find_unified_root (root,sizeof (root),NULL ))ksft_exit_skip ("cgroup v2 isn't mounted\n" );
@@ -827,6 +826,7 @@ int main(int argc, char **argv)if (cg_write (root,"cgroup.subtree_control" ,"+memory" ))ksft_exit_skip ("Failed to set memory controller\n" ); +ksft_set_plan (ARRAY_SIZE (tests));for (i =0 ; i <ARRAY_SIZE (tests); i++) {switch (tests[i].fn (root)) {case KSFT_PASS :
Signature · 1 line
2.43.7
Quoted 24 lines · Hemanth Selam
The cgroup tests announce their plan before checking whether cgroup v2 is available, so on a host without it they promise a number of results and then skip out after the first one:
TAP version 13 1..3 ok 1 # SKIP cgroup v2 isn't mounted # Planned tests != run tests (3 != 1) # Totals: pass:0 fail:0 xfail:0 xpass:0 skip:1 error:0
ksft_exit_skip()can only emit a well formed "1..0 # SKIP" line while no plan has been printed, as the comment above it inkselftest.hpoints out.Move
ksft_set_plan()below the setup checks that can skip, so that a skipped run reports:TAP version 13
1..0 # SKIP cgroup v2 isn't mountedSeveral of the tests skip more than once while setting up, for a missing or unwritable controller as well, so the plan goes after the last of them.
test_corejoins its two setup paths at thepost_v2_setuplabel and sets the plan there.
Quoted 8 lines
Reporting each planned test as skipped instead would keep the plan where it is, but the setup failures here mean the whole test cannot run rather than its individual cases being skipped, which is what "1..0 # SKIP" is for.
Fixes 1dc830ee4c15 ("selftests/cgroup: conform test to KTAP format output")Signed-off-by Hemanth Selam <[email protected]>---
LGTM, so:
Quoted 9 lines · Hemanth Selam
The cgroup tests announce their plan before checking whether cgroup v2 is available, so on a host without it they promise a number of results and then skip out after the first one:
TAP version 13 1..3 ok 1 # SKIP cgroup v2 isn't mounted # Planned tests != run tests (3 != 1) # Totals: pass:0 fail:0 xfail:0 xpass:0 skip:1 error:0
Applied to cgroup/for-7.3-fixes.
Thanks.
Signature · 1 line
tejun