[igt-dev] [PATCH i-g-t] kms_atomic_transition: Avoid duplicate dynamic subtest names

Chris Wilson chris at chris-wilson.co.uk
Tue Jun 9 13:48:08 UTC 2020


Quoting Petri Latvala (2020-06-09 14:40:33)
> In commit b943d64f95bc ("kms_atomic_transition: Make the available
> pipe discovery dynamic") the subtests of kms_atomic_transition were
> split into dynamic subtests. What avoided scrutiny however was that
> the looping uses for_each_pipe_with_valid_output, which gives you
> every valid pipe/output combo, so just using the pipe name as the
> dynamic subtest name causes duplicates, resulting in weird CI results.

Ah, I just thought it was an output for that pipe, not every output.

> As the nature of the original test was a stress test for watermarks,
> keep the full combo rather than switching to
> for_each_pipe_with_single_output, but use the output name as well in
> the dynamic subtest name.
> 
> Signed-off-by: Petri Latvala <petri.latvala at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  tests/kms_atomic_transition.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index d28a8cdf..754a4969 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -926,42 +926,42 @@ igt_main
>  
>         igt_subtest_with_dynamic("plane-all-transition") {
>                 for_each_pipe_with_valid_output(&display, pipe, output) {
> -                       igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe))
> +                       igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
>                                 run_transition_test(&display, pipe, output, TRANSITION_PLANES, false, false);

Makes sense given the revelation.

All 10 dynamic subtests accounted for.
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris


More information about the igt-dev mailing list