selftests/cgroup: conform test to KTAP format output

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>

diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c
index a360e2eb2eefdd372738e9dfb9451f2cedc7e18d..1d778c8b7764fd4d56132b32295ad4d7453d9d83 100644 (file)
--- a/tools/testing/selftests/cgroup/test_core.c
+++ b/tools/testing/selftests/cgroup/test_core.c
@@ -923,8 +923,10 @@ struct corecg_test {
 int main(int argc, char *argv[])
 {
        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 (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");
@@ -946,12 +948,11 @@ int main(int argc, char *argv[])
                        ksft_test_result_skip("%s\n", tests[i].name);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
        cleanup_named_v1_root(root);
-       return ret;
+       ksft_finished();
 }

diff --git a/tools/testing/selftests/cgroup/test_cpu.c b/tools/testing/selftests/cgroup/test_cpu.c
index 2a60e6c41940c5cc01566842f74633bfcd16403c..36be3e820df27ec9d243dbb5fbf63d921e4deec2 100644 (file)
--- a/tools/testing/selftests/cgroup/test_cpu.c
+++ b/tools/testing/selftests/cgroup/test_cpu.c
@@ -796,8 +796,10 @@ struct cpucg_test {
 int main(int argc, char *argv[])
 {
        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))
                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);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
-       return ret;
+       ksft_finished();
 }

diff --git a/tools/testing/selftests/cgroup/test_cpuset.c b/tools/testing/selftests/cgroup/test_cpuset.c
index 4034d14ba69ac03b119d9718beca6e66332d90cf..8086d2ea394f6016d8c22fdab8b18bda444ac254 100644 (file)
--- a/tools/testing/selftests/cgroup/test_cpuset.c
+++ b/tools/testing/selftests/cgroup/test_cpuset.c
@@ -247,8 +247,10 @@ struct cpuset_test {
 int main(int argc, char *argv[])
 {
        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))
                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);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
-       return ret;
+       ksft_finished();
 }

diff --git a/tools/testing/selftests/cgroup/test_freezer.c b/tools/testing/selftests/cgroup/test_freezer.c
index dfb763819581fadd82abe9b9c87fc6e8aabb8d2e..465cdad2bfcaf461fc80781e84c521e65a4cdc03 100644 (file)
--- a/tools/testing/selftests/cgroup/test_freezer.c
+++ b/tools/testing/selftests/cgroup/test_freezer.c
@@ -1488,8 +1488,10 @@ struct cgfreezer_test {
 int main(int argc, char *argv[])
 {
        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))
                ksft_exit_skip("cgroup v2 isn't mounted\n");
        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);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
-       return ret;
+       ksft_finished();
 }

diff --git a/tools/testing/selftests/cgroup/test_kill.c b/tools/testing/selftests/cgroup/test_kill.c
index 0e5bb6c7307a504ffb76653a1241e6beb8c12e3b..ed590b150a17ad7c80ad3df2db43f511401d2a7e 100644 (file)
--- a/tools/testing/selftests/cgroup/test_kill.c
+++ b/tools/testing/selftests/cgroup/test_kill.c
@@ -274,8 +274,10 @@ struct cgkill_test {
 int main(int argc, char *argv[])
 {
        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))
                ksft_exit_skip("cgroup v2 isn't mounted\n");
        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);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
-       return ret;
+       ksft_finished();
 }

diff --git a/tools/testing/selftests/cgroup/test_kmem.c b/tools/testing/selftests/cgroup/test_kmem.c
index 63b3c9aad399aaef0d66ce294a7ae89cc2c6e21d..d4c4a514ee4342369cde914f7e09515ca5ecf2d9 100644 (file)
--- a/tools/testing/selftests/cgroup/test_kmem.c
+++ b/tools/testing/selftests/cgroup/test_kmem.c
@@ -421,8 +421,10 @@ struct kmem_test {
 int main(int argc, char **argv)
 {
        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))
                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);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
-       return ret;
+       ksft_finished();
 }

diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
index a680f773f2d54d5754ff12807140163b12caa844..b117325c0439d413fc1475595f05ad20a2c61ba2 100644 (file)
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -1650,8 +1650,10 @@ struct memcg_test {
 int main(int argc, char **argv)
 {
        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))
                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);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
-       return ret;
+       ksft_finished();
 }

diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c
index e1f578ca28416d5758ab18856814591c5d1def81..86a8930b47e3a2c5f9fca561eac24eadae4b1c5f 100644 (file)
--- a/tools/testing/selftests/cgroup/test_zswap.c
+++ b/tools/testing/selftests/cgroup/test_zswap.c
@@ -597,8 +597,10 @@ static bool zswap_configured(void)
 int main(int argc, char **argv)
 {
        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))
                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);
                        break;
                default:
-                       ret = EXIT_FAILURE;
                        ksft_test_result_fail("%s\n", tests[i].name);
                        break;
                }
        }
 
-       return ret;
+       ksft_finished();
 }