Commit 1dc830ee authored by Guopeng Zhang's avatar Guopeng Zhang Committed by Tejun Heo
Browse files

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: default avatarGuopeng Zhang <zhangguopeng@kylinos.cn>
Suggested-by: default avatarSebastian Chlad <sebastian.chlad@suse.com>
Acked-by: default avatarMichal Koutný <mkoutny@suse.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent f23cb0ce

tools/testing/selftests/cgroup/test_core.c

+4 −3
Original line number Diff line number Diff line
@@ -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();

}

tools/testing/selftests/cgroup/test_cpu.c

+4 −3
Original line number Diff line number Diff line
@@ -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();

}

tools/testing/selftests/cgroup/test_cpuset.c

+4 −3
Original line number Diff line number Diff line
@@ -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();

}

tools/testing/selftests/cgroup/test_freezer.c

+4 −3
Original line number Diff line number Diff line
@@ -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();

}

tools/testing/selftests/cgroup/test_kill.c

+4 −3
Original line number Diff line number Diff line
@@ -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();

}