public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 3/3] tests/kms_flip: Do not request event for flips we expect to fail.
Date: Wed, 10 Apr 2019 13:19:31 +0200	[thread overview]
Message-ID: <20190410111931.28305-3-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20190410111931.28305-1-maarten.lankhorst@linux.intel.com>

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@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

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-04-10 11:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-10 11:19 [igt-dev] [PATCH i-g-t 1/3] kms_flip: Make busy-flip test less strict Maarten Lankhorst
2019-04-10 11:19 ` [igt-dev] [PATCH i-g-t 2/3] tests/kms_flip: Reduce runtime to 1s for busy-flip Maarten Lankhorst
2019-04-10 11:19 ` Maarten Lankhorst [this message]
2019-04-10 11:24   ` [igt-dev] [PATCH i-g-t 3/3] tests/kms_flip: Do not request event for flips we expect to fail Chris Wilson
2019-04-10 12:44     ` Maarten Lankhorst
2019-04-10 12:50       ` Chris Wilson
2019-04-10 15:52         ` Maarten Lankhorst
2019-04-10 12:19 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/3] kms_flip: Make busy-flip test less strict Patchwork
2019-04-10 15:39 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190410111931.28305-3-maarten.lankhorst@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox