Re: [PATCH v2 1/3] perf test: Check test suite description properly

[Ian Rogers]

On Tue, Jul 1, 2025 at 1:10 PM Namhyung Kim <namhyung@xxxxxxxxxx> wrote:
>
> Currently perf test checks the given string with descriptions for both
> test suites and cases (subtests).  But sometimes it's confusing since
> the subtests don't contain the important keyword.
>
> I think it's better to check the suite level and run the whole suite
> together if it matches description in the suite.
>
> Before:
>   $ perf test hwmon
>   (no output)
>
> After:
>   $ perf test hwmon
>    10: Hwmon PMU                                                       :
>    10.1: Basic parsing test                                            : Ok
>    10.2: Parsing without PMU name                                      : Ok
>    10.3: Parsing with PMU name                                         : Ok
>
> And keep the existing behavior when it only matches test description only.
>
>   $ perf test "Equal cpu map"
>    39.5: Equal cpu map                                                 : Ok
>
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>

Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>

Thanks,
Ian

> ---
>  tools/perf/tests/builtin-test.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> index 80375ca39a37a256..846c9b3a732c9b3a 100644
> --- a/tools/perf/tests/builtin-test.c
> +++ b/tools/perf/tests/builtin-test.c
> @@ -539,6 +539,7 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[],
>
>                 for (struct test_suite **t = suites; *t; t++, curr_suite++) {
>                         int curr_test_case;
> +                       bool suite_matched = false;
>
>                         if (!perf_test__matches(test_description(*t, -1), curr_suite, argc, argv)) {
>                                 /*
> @@ -556,6 +557,8 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[],
>                                 }
>                                 if (skip)
>                                         continue;
> +                       } else {
> +                               suite_matched = true;
>                         }
>
>                         if (intlist__find(skiplist, curr_suite + 1)) {
> @@ -567,10 +570,10 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[],
>
>                         for (unsigned int run = 0; run < runs_per_test; run++) {
>                                 test_suite__for_each_test_case(*t, curr_test_case) {
> -                                       if (!perf_test__matches(test_description(*t, curr_test_case),
> +                                       if (!suite_matched &&
> +                                           !perf_test__matches(test_description(*t, curr_test_case),
>                                                                 curr_suite, argc, argv))
>                                                 continue;
> -
>                                         err = start_test(*t, curr_suite, curr_test_case,
>                                                          &child_tests[child_test_num++],
>                                                          width, pass);
> --
> 2.50.0.727.gbf7dc18ff4-goog
>