flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 18:06:13 +00:00
Code Issues Releases Wiki Activity

tests/kms_universal_plane: Fix subtest enumeration

Browse Source 
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 <matthew.d.roper@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Matt Roper 2015-01-26 09:23:51 -08:00 committed by Thomas Wood
parent e8e28931b1
commit 89201c5328
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/kms_universal_plane.c
View File

@ -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_main
igt_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 {