From 838f321b9ff1ef897ab032ecc3bbb56d8d65f53f Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Thu, 3 Jul 2014 15:50:53 +0100 Subject: 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 Signed-off-by: Damien Lespiau --- tests/kms_universal_plane.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/kms_universal_plane.c') 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); -- cgit v1.2.3