[PATCH weston 04/21] tests: ensure output dependent IVI tests run

[Pekka Paalanen]

From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

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 at collabora.co.uk>
---
 tests/ivi_layout-internal-test.c | 8 ++++----
 1 file 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);
-- 
2.13.5