diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2014-07-03 15:50:53 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2014-07-04 12:04:27 +0100 |
| commit | 838f321b9ff1ef897ab032ecc3bbb56d8d65f53f (patch) | |
| tree | 6cf9be010ef845ba4546ab5c0f2213425045d426 /tests/kms_universal_plane.c | |
| parent | 3f46e815589ac5c0e9ba2d5ab94e7eff09527a8d (diff) | |
kms_universal_plane: Don't assert outside of fixtures/subtests
Doing otherwise breaks listing the subtests. The test was throwing an
error out when universal planes were disabled as well because of that.
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'tests/kms_universal_plane.c')
| -rw-r--r-- | tests/kms_universal_plane.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c index fe0fde36..c64cdbb9 100644 --- a/tests/kms_universal_plane.c +++ b/tests/kms_universal_plane.c @@ -133,6 +133,7 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) int num_primary = 0, num_cursor = 0; int i; + igt_assert(data->display.has_universal_planes); igt_skip_on(pipe >= display->n_pipes); fprintf(stdout, "Testing connector %s using pipe %c\n", @@ -535,8 +536,6 @@ run_tests_for_pipe(data_t *data, enum pipe pipe) { igt_output_t *output; - igt_assert(data->display.has_universal_planes); - igt_subtest_f("universal-plane-pipe-%c-functional", pipe_name(pipe)) for_each_connected_output(&data->display, output) functional_test_pipe(data, pipe, output); |