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

perf test: Remove is_supported function 



All tests now return TEST_SKIP if not supported. Removing this function
brings perf's test_suite struct more inline with kunit.

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-22-irogers@google.com


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

tools/perf/tests/builtin-test.c

+1 −13
Original line number Diff line number Diff line
@@ -150,11 +150,6 @@ static const char *test_description(const struct test_suite *t, int subtest) 
	return t->desc;

}



static bool is_supported(const struct test_suite *t)

{

	return !t->is_supported || t->is_supported();

}



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

{

	if (subtest <= 0)
@@ -480,12 +475,6 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) 
				continue;

		}



		if (!is_supported(t)) {

			pr_debug("%2d: %-*s: Disabled\n", i, width,

				 test_description(t, -1));

			continue;

		}



		pr_info("%2d: %-*s:", i, width, test_description(t, -1));



		if (intlist__find(skiplist, i)) {
@@ -583,8 +572,7 @@ static int perf_test__list(int argc, const char **argv) 
	for_each_test(j, k, t) {

		int curr = i++;



		if (!perf_test__matches(test_description(t, -1), curr, argc, argv) ||

		    !is_supported(t))

		if (!perf_test__matches(test_description(t, -1), curr, argc, argv))

			continue;



		pr_info("%2d: %s\n", i, test_description(t, -1));

tools/perf/tests/tests.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct test_suite { 
		bool skip_if_fail;

	} subtest;

	struct test_case *test_cases;

	bool (*is_supported)(void);

	void *priv;

};