[PATCH v2] selftests/cgroup: conform test to KTAP format output

14 Nov 2025

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
---
v2:
Change subject and commit message to refer to KTAP instead of TAP.
No code changes.
---
 tools/testing/selftests/cgroup/test_core.c       | 7 ++++---
 tools/testing/selftests/cgroup/test_cpu.c        | 7 ++++---
 tools/testing/selftests/cgroup/test_cpuset.c     | 7 ++++---
 tools/testing/selftests/cgroup/test_freezer.c    | 7 ++++---
 tools/testing/selftests/cgroup/test_kill.c       | 7 ++++---
 tools/testing/selftests/cgroup/test_kmem.c       | 7 ++++---
 tools/testing/selftests/cgroup/test_memcontrol.c | 7 ++++---
 tools/testing/selftests/cgroup/test_zswap.c      | 7 ++++---
 8 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c
index 5e5b8c4b8c0e..102262555a59 100644
--- 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 7d77d3d43c8e..c83f05438d7c 100644
--- 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 8094091a5857..c5cf8b56ceb8 100644
--- 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 714c963aa3f5..97fae92c8387 100644
--- 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 a4dd326ced79..c8c9d306925b 100644
--- 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 005a142f3492..ca38525484e3 100644
--- 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 2e9d78ab641c..4e1647568c5b 100644
--- 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 ab865d900791..64ebc3f3f203 100644
--- 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();
 }
-- 
2.25.1



    

2025

2024

2023

2022

2021

2020

2019

2018

2017

[PATCH v2] selftests/cgroup: conform test to KTAP format output