summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2017-08-17 13:30:11 +0300
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2017-10-04 15:03:56 +0300
commitd05a8192527cc85c2ae86f823581872722386214 (patch)
tree7e460a89f995e4ea3eaac3a4b9c43600e79b8a53 /tests
parent427041454952502e7e085ed891a7eed4151b26ab (diff)
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/ivi_layout-internal-test.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index f7f7c805..4d73eff1 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -501,7 +501,7 @@ test_screen_render_order(struct test_context *ctx)
int32_t length = 0;
uint32_t i;
- if (wl_list_empty(&ctx->compositor->output_list))
+ if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return;
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;
uint32_t i;
- if (wl_list_empty(&ctx->compositor->output_list))
+ if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return;
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;
uint32_t i;
- if (wl_list_empty(&ctx->compositor->output_list))
+ if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return;
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] = {};
uint32_t i;
- if (wl_list_empty(&ctx->compositor->output_list))
+ if (!iassert(!wl_list_empty(&ctx->compositor->output_list)))
return;
output = wl_container_of(ctx->compositor->output_list.next, output, link);