[Intel-gfx] [PATCH i-g-t] kms_universal_plane: Don't assert outside of fixtures/subtests

Damien Lespiau damien.lespiau at intel.com
Fri Jul 4 13:01:24 CEST 2014


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 at intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 tests/kms_universal_plane.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index fe0fde3..c64cdbb 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);
-- 
1.8.3.1




More information about the Intel-gfx mailing list