diff options
| author | Song Hu <husong@kylinos.cn> | 2026-07-14 10:15:11 +0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-07-14 11:42:10 -1000 |
| commit | 97e7efdda8a2b0c2ed2f15e4e49d25ab89d2bfa2 (patch) | |
| tree | cb4a49b32c7b78df5e6873c892e91da7f0be932d | |
| parent | ac1607366c04ad833e37c14e7b70c8f7ebe42339 (diff) | |
| download | linux-stable-97e7efdda8a2b0c2ed2f15e4e49d25ab89d2bfa2.tar.gz linux-stable-97e7efdda8a2b0c2ed2f15e4e49d25ab89d2bfa2.zip | |
selftests/cgroup: fix missing TAP output in test_hugetlb_memcg
main() in test_hugetlb_memcg never calls ksft_print_header(),
ksft_set_plan(), or ksft_finished(), so its output has no TAP plan and is
not valid TAP, unlike the sibling test_memcontrol and test_kmem tests.
Add the header/plan/finished calls following the same pattern.
Signed-off-by: Song Hu <husong@kylinos.cn>
Reviewed-by: Tao Cui <cuitao@kylinos.cn>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | tools/testing/selftests/cgroup/test_hugetlb_memcg.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c index b627d84358b1..8c5aced813b6 100644 --- a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c +++ b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c @@ -199,7 +199,10 @@ out: int main(int argc, char **argv) { char root[PATH_MAX]; - int ret = EXIT_SUCCESS, has_memory_hugetlb_acc; + int has_memory_hugetlb_acc; + + ksft_print_header(); + ksft_set_plan(1); has_memory_hugetlb_acc = proc_mount_contains("memory_hugetlb_accounting"); if (has_memory_hugetlb_acc < 0) @@ -211,7 +214,7 @@ int main(int argc, char **argv) if (get_hugepage_size() != 2048) { ksft_print_msg("test_hugetlb_memcg requires 2MB hugepages\n"); ksft_test_result_skip("test_hugetlb_memcg\n"); - return ret; + ksft_finished(); } if (cg_find_unified_root(root, sizeof(root), NULL)) @@ -233,10 +236,9 @@ int main(int argc, char **argv) ksft_test_result_skip("test_hugetlb_memcg\n"); break; default: - ret = EXIT_FAILURE; ksft_test_result_fail("test_hugetlb_memcg\n"); break; } - return ret; + ksft_finished(); } |