kms_universal_plane: Don't assert outside of fixtures/subtests
authorDamien Lespiau <damien.lespiau@intel.com>
Thu, 3 Jul 2014 14:50:53 +0000 (15:50 +0100)
committerDamien Lespiau <damien.lespiau@intel.com>
Fri, 4 Jul 2014 11:04:27 +0000 (12:04 +0100)
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>
tests/kms_universal_plane.c

index fe0fde3..c64cdbb 100644 (file)
@@ -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);