From 71d03581d5ae3bb049790992b23a471bb7cd14ca Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 3 Nov 2021 23:42:07 -0700 Subject: [PATCH] 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: Ian Rogers Tested-by: Sohaib Mohamed Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Brendan Higgins Cc: Daniel Latypov Cc: David Gow Cc: Ingo Molnar Cc: Jin Yao Cc: John Garry Cc: Mark Rutland Cc: Namhyung Kim Cc: Paul Clarke Cc: Peter Zijlstra Cc: Stephane Eranian Link: https://lore.kernel.org/r/20211104064208.3156807-22-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/builtin-test.c | 14 +------------- tools/perf/tests/tests.h | 1 - 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 1d9c0e03b8dbc..19b1228dbd5d5 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -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)); diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index 958f94dcc94c9..15051801c7901 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -44,7 +44,6 @@ struct test_suite { bool skip_if_fail; } subtest; struct test_case *test_cases; - bool (*is_supported)(void); void *priv; }; -- 2.39.5