lkml.org 
[lkml]   [2021]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 21/22] perf test: Remove is_supported function
On Wed, Oct 13, 2021 at 10:46:03AM -0700, Ian Rogers wrote:
> All tests now return TEST_SKIP if not supported. Removing this function
> brings perf's test_suite struct more inline with kunit.

ah ok, forget my previous comment then ;-)

jirka

>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> 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 966948cacba3..086641f60015 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 958f94dcc94c..15051801c790 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.33.0.882.g93a45727a2-goog
>

\
 
 \ /
  Last update: 2021-10-20 15:06    [W:0.180 / U:2.336 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site