github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selftests/cgroup: conform test to KTAP format output

Browse Source 
Conform the layout, informational and status messages to KTAP.  No
functional change is intended other than the layout of output messages.

Signed-off-by: Guopeng Zhang <zhangguopeng@kylinos.cn>
Suggested-by: Sebastian Chlad <sebastian.chlad@suse.com>
Acked-by: Michal Koutný <mkoutny@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Guopeng Zhang 2025-11-14 18:24:40 +08:00 committed by Tejun Heo
parent f23cb0ced8
commit 1dc830ee4c
8 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/testing/selftests/cgroup/test_core.c
View File

@ -923,8 +923,10 @@ struct corecg_test {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, ret = EXIT_SUCCESS; int i;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), &nsdelegate)) { if (cg_find_unified_root(root, sizeof(root), &nsdelegate)) {
if (setup_named_v1_root(root, sizeof(root), CG_NAMED_NAME)) 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"); ksft_exit_skip("cgroup v2 isn't mounted and could not setup named v1 hierarchy\n");
@ -946,12 +948,11 @@ int main(int argc, char *argv[])
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
cleanup_named_v1_root(root); cleanup_named_v1_root(root);
return ret; ksft_finished();
} }

7
tools/testing/selftests/cgroup/test_cpu.c
View File

@ -796,8 +796,10 @@ struct cpucg_test {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, ret = EXIT_SUCCESS; int i;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), NULL)) if (cg_find_unified_root(root, sizeof(root), NULL))
ksft_exit_skip("cgroup v2 isn't mounted\n"); ksft_exit_skip("cgroup v2 isn't mounted\n");
@ -814,11 +816,10 @@ int main(int argc, char *argv[])
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
return ret; ksft_finished();
} }

7
tools/testing/selftests/cgroup/test_cpuset.c
View File

@ -247,8 +247,10 @@ struct cpuset_test {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, ret = EXIT_SUCCESS; int i;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), NULL)) if (cg_find_unified_root(root, sizeof(root), NULL))
ksft_exit_skip("cgroup v2 isn't mounted\n"); ksft_exit_skip("cgroup v2 isn't mounted\n");
@ -265,11 +267,10 @@ int main(int argc, char *argv[])
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
return ret; ksft_finished();
} }

7
tools/testing/selftests/cgroup/test_freezer.c
View File

@ -1488,8 +1488,10 @@ struct cgfreezer_test {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, ret = EXIT_SUCCESS; int i;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), NULL)) if (cg_find_unified_root(root, sizeof(root), NULL))
ksft_exit_skip("cgroup v2 isn't mounted\n"); ksft_exit_skip("cgroup v2 isn't mounted\n");
for (i = 0; i < ARRAY_SIZE(tests); i++) { for (i = 0; i < ARRAY_SIZE(tests); i++) {
@ -1501,11 +1503,10 @@ int main(int argc, char *argv[])
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
return ret; ksft_finished();
} }

7
tools/testing/selftests/cgroup/test_kill.c
View File

@ -274,8 +274,10 @@ struct cgkill_test {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, ret = EXIT_SUCCESS; int i;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), NULL)) if (cg_find_unified_root(root, sizeof(root), NULL))
ksft_exit_skip("cgroup v2 isn't mounted\n"); ksft_exit_skip("cgroup v2 isn't mounted\n");
for (i = 0; i < ARRAY_SIZE(tests); i++) { for (i = 0; i < ARRAY_SIZE(tests); i++) {
@ -287,11 +289,10 @@ int main(int argc, char *argv[])
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
return ret; ksft_finished();
} }

7
tools/testing/selftests/cgroup/test_kmem.c
View File

@ -421,8 +421,10 @@ struct kmem_test {
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, ret = EXIT_SUCCESS; int i;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), NULL)) if (cg_find_unified_root(root, sizeof(root), NULL))
ksft_exit_skip("cgroup v2 isn't mounted\n"); ksft_exit_skip("cgroup v2 isn't mounted\n");
@ -446,11 +448,10 @@ int main(int argc, char **argv)
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
return ret; ksft_finished();
} }

7
tools/testing/selftests/cgroup/test_memcontrol.c
View File

@ -1650,8 +1650,10 @@ struct memcg_test {
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, proc_status, ret = EXIT_SUCCESS; int i, proc_status;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), NULL)) if (cg_find_unified_root(root, sizeof(root), NULL))
ksft_exit_skip("cgroup v2 isn't mounted\n"); ksft_exit_skip("cgroup v2 isn't mounted\n");
@ -1685,11 +1687,10 @@ int main(int argc, char **argv)
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
return ret; ksft_finished();
} }

7
tools/testing/selftests/cgroup/test_zswap.c
View File

@ -597,8 +597,10 @@ static bool zswap_configured(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char root[PATH_MAX]; char root[PATH_MAX];
int i, ret = EXIT_SUCCESS; int i;
ksft_print_header();
ksft_set_plan(ARRAY_SIZE(tests));
if (cg_find_unified_root(root, sizeof(root), NULL)) if (cg_find_unified_root(root, sizeof(root), NULL))
ksft_exit_skip("cgroup v2 isn't mounted\n"); ksft_exit_skip("cgroup v2 isn't mounted\n");
@ -625,11 +627,10 @@ int main(int argc, char **argv)
ksft_test_result_skip("%s\n", tests[i].name); ksft_test_result_skip("%s\n", tests[i].name);
break; break;
default: default:
ret = EXIT_FAILURE;
ksft_test_result_fail("%s\n", tests[i].name); ksft_test_result_fail("%s\n", tests[i].name);
break; break;
} }
} }
return ret; ksft_finished();
} }