[igt-dev] [PATCH i-g-t 3/3] tests/kms_flip: Do not request event for flips we expect to fail.

[Maarten Lankhorst]

If we unexpectedly pass, we get a cryptic
(kms_flip:935) CRITICAL: Test assertion failure function set_flag, file kms_flip.c:271:
(kms_flip:935) CRITICAL: Failed assertion: !(*v & flag)
(kms_flip:935) CRITICAL: Last errno: 25, Inappropriate ioctl for device

Instead of a more descriptive assertion error, clear the request for
event to fix this.

This will change the error reported in bug #103257.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=103257
---
 tests/kms_flip.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index e50c91ead12c..f8f3581eed2b 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -692,7 +692,7 @@ static unsigned int run_test_step(struct test_output *o)
 	}
 
 	if (do_flip && (o->flags & TEST_EINVAL) && o->flip_state.count > 0)
-		igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval);
+		igt_assert(do_page_flip(o, new_fb_id, false) == expected_einval);
 
 	if (do_vblank && (o->flags & TEST_EINVAL) && o->vblank_state.count > 0)
 		igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, &vbl_reply)
@@ -765,7 +765,7 @@ static unsigned int run_test_step(struct test_output *o)
 	}
 
 	if (do_flip && (o->flags & TEST_EBUSY))
-		igt_assert(do_page_flip(o, new_fb_id, true) == -EBUSY);
+		igt_assert(do_page_flip(o, new_fb_id, false) == -EBUSY);
 
 	if (do_flip && (o->flags & TEST_RMFB))
 		recreate_fb(o);
@@ -806,7 +806,7 @@ static unsigned int run_test_step(struct test_output *o)
 			   == -EINVAL);
 
 	if (do_flip && (o->flags & TEST_EINVAL))
-		igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval);
+		igt_assert(do_page_flip(o, new_fb_id, false) == expected_einval);
 
 	unhang_gpu(drm_fd, hang);
 
-- 
2.20.1