Skip to content
Snippets Groups Projects
Commit 25901bcc authored by Pekka Paalanen's avatar Pekka Paalanen
Browse files

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's avatarPekka Paalanen <pekka.paalanen@collabora.co.uk>
parent 0c15a25e
No related branches found
No related tags found
No related merge requests found
...@@ -501,7 +501,7 @@ test_screen_render_order(struct test_context *ctx) ...@@ -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) ...@@ -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) ...@@ -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( ...@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment