tests: ensure output dependent IVI tests run

There are IVI tests that require an output. Previously these tests would
silently skip if no outputs were present. However, a test setup should
always have outputs with these tests. Skipping could easily leave the
tests dead without notice.

Make these tests fail instead of skip if there are no outputs.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Ian Ray <ian.ray@ge.com>
Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
Acked-by Daniel Stone <daniels@collabora.com>
dev
Pekka Paalanen 7 years ago
parent 4270414549
commit d05a819252
  1. 8
      tests/ivi_layout-internal-test.c

@ -501,7 +501,7 @@ test_screen_render_order(struct test_context *ctx)
int32_t length = 0; int32_t length = 0;
uint32_t i; uint32_t i;
if (wl_list_empty(&ctx->compositor->output_list)) if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return; return;
output = wl_container_of(ctx->compositor->output_list.next, output, link); output = wl_container_of(ctx->compositor->output_list.next, output, link);
@ -547,7 +547,7 @@ test_screen_bad_render_order(struct test_context *ctx)
int32_t length = 0; int32_t length = 0;
uint32_t i; uint32_t i;
if (wl_list_empty(&ctx->compositor->output_list)) if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return; return;
output = wl_container_of(ctx->compositor->output_list.next, output, link); output = wl_container_of(ctx->compositor->output_list.next, output, link);
@ -580,7 +580,7 @@ test_screen_add_layers(struct test_context *ctx)
int32_t length = 0; int32_t length = 0;
uint32_t i; uint32_t i;
if (wl_list_empty(&ctx->compositor->output_list)) if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return; return;
output = wl_container_of(ctx->compositor->output_list.next, output, link); output = wl_container_of(ctx->compositor->output_list.next, output, link);
@ -699,7 +699,7 @@ test_commit_changes_after_render_order_set_layer_destroy(
struct ivi_layout_layer *ivilayers[LAYER_NUM] = {}; struct ivi_layout_layer *ivilayers[LAYER_NUM] = {};
uint32_t i; uint32_t i;
if (wl_list_empty(&ctx->compositor->output_list)) if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return; return;
output = wl_container_of(ctx->compositor->output_list.next, output, link); output = wl_container_of(ctx->compositor->output_list.next, output, link);

Loading…
Cancel
Save