tests/kms_universal_plane: Fix subtest enumeration
PATCH 1/1 tests/kms_universal_plane: Fix subtest enumeration
We shouldn't use the contents of data.display to determine which pipes to run subtests on since this structure is initialized in an igt_fixture and won't contain any useful data when enumerating subtests (i.e., --list-subtests won't return anything).
Instead, just assume we have three pipes in the main loop and ensure that each subtest will skip if we don't really have that many.
Signed-off-by Matt Roper <[email protected]>
--- tests/kms_universal_plane.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tests/kms_universal_plane.c +5 -4
@@ -359,6 +359,8 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)drmModeModeInfo *mode;int i, ret =0 ; +igt_skip_on (pipe >= data->display.n_pipes); +igt_output_set_pipe (output, pipe); mode =igt_output_get_mode (output);
@@ -471,6 +473,8 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)fd_set fds;int ret =0 ; +igt_skip_on (pipe >= data->display.n_pipes); +igt_output_set_pipe (output, pipe);pageflip_test_init (&test, output, pipe);
@@ -552,8 +556,6 @@ static data_t data;igt_main { -int num_pipes; -igt_skip_on_simulation (); igt_fixture {
@@ -567,8 +569,7 @@ igt_mainigt_require (data.display.has_universal_planes); } - num_pipes =igt_display_get_n_pipes (&data.display); -for (int pipe =0 ; pipe < num_pipes; pipe++) +for (int pipe =0 ; pipe <3 ; pipe++)run_tests_for_pipe (&data, pipe); igt_fixture {
Signature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx