Commit c76ec1cf authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Remove non test case style support. 



Convert shell tests to also run using test case style.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarSohaib Mohamed <sohaib.amhmd@gmail.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Brendan Higgins <brendanhiggins@google.com>
Cc: Daniel Latypov <dlatypov@google.com>
Cc: David Gow <davidgow@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20211104064208.3156807-19-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1870356f

tools/perf/tests/builtin-test.c

+16 −9
Original line number Diff line number Diff line
@@ -157,9 +157,6 @@ static bool is_supported(const struct test_suite *t) 


static test_fnptr test_function(const struct test_suite *t, int subtest)

{

	if (t->func)

		return t->func;



	if (subtest <= 0)

		return t->test_cases[0].run_case;
@@ -413,24 +410,34 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width, 
	for_each_shell_test(entlist, n_dirs, st.dir, ent) {

		int curr = i++;

		char desc[256];

		struct test_suite test = {

			.desc = shell_test__description(desc, sizeof(desc), st.dir, ent->d_name),

			.func = shell_test__run,

		struct test_case test_cases[] = {

			{

				.desc = shell_test__description(desc,

								sizeof(desc),

								st.dir,

								ent->d_name),

				.run_case = shell_test__run,

			},

			{ .name = NULL, }

		};

		struct test_suite test_suite = {

			.desc = test_cases[0].desc,

			.test_cases = test_cases,

			.priv = &st,

		};



		if (!perf_test__matches(test.desc, curr, argc, argv))

		if (!perf_test__matches(test_suite.desc, curr, argc, argv))

			continue;



		st.file = ent->d_name;

		pr_info("%2d: %-*s:", i, width, test.desc);

		pr_info("%2d: %-*s:", i, width, test_suite.desc);



		if (intlist__find(skiplist, i)) {

			color_fprintf(stderr, PERF_COLOR_YELLOW, " Skip (user override)\n");

			continue;

		}



		test_and_print(&test, false, -1);

		test_and_print(&test_suite, false, 0);

	}



	for (e = 0; e < n_dirs; e++)

tools/perf/tests/tests.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct test_case { 


struct test_suite {

	const char *desc;

	test_fnptr func;

	struct {

		bool skip_if_fail;

	} subtest;