This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l2-compliance: fix S_SELECTION tests Author: Hans Verkuil <hverkuil-ci...@xs4all.nl> Date: Thu Jun 13 12:01:17 2019 +0200 If a driver doesn't implement S_SELECTION, then these tests return ENOTTY instead of EINVAL. So just checking against EINVAL isn't good enough. Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> utils/v4l2-compliance/v4l2-test-formats.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=aed8b11edb03f68c62e5b54be6ee82857bca0c6f diff --git a/utils/v4l2-compliance/v4l2-test-formats.cpp b/utils/v4l2-compliance/v4l2-test-formats.cpp index 22cebe17d3d6..c762b3df8141 100644 --- a/utils/v4l2-compliance/v4l2-test-formats.cpp +++ b/utils/v4l2-compliance/v4l2-test-formats.cpp @@ -1421,7 +1421,6 @@ static int testBasicCrop(struct node *node, unsigned type) }; struct v4l2_selection sel_def; struct v4l2_selection sel_bounds; - int s_sel_ret = EINVAL; fail_on_test(doioctl(node, VIDIOC_G_SELECTION, &sel_crop)); fail_on_test(!sel_crop.r.width || !sel_crop.r.height); @@ -1446,7 +1445,8 @@ static int testBasicCrop(struct node *node, unsigned type) // Check handling of invalid type. sel_crop.type = 0xff; - fail_on_test(doioctl(node, VIDIOC_S_SELECTION, &sel_crop) != s_sel_ret); + int s_sel_ret = doioctl(node, VIDIOC_S_SELECTION, &sel_crop); + fail_on_test(s_sel_ret != EINVAL && s_sel_ret != ENOTTY); // Check handling of invalid target. sel_crop.type = type; sel_crop.target = 0xffff; @@ -1556,7 +1556,6 @@ static int testBasicCompose(struct node *node, unsigned type) struct v4l2_selection sel_def; struct v4l2_selection sel_bounds; struct v4l2_selection sel_padded; - int s_sel_ret = EINVAL; int ret; fail_on_test(doioctl(node, VIDIOC_G_SELECTION, &sel_compose)); @@ -1590,7 +1589,8 @@ static int testBasicCompose(struct node *node, unsigned type) // Check handling of invalid type. sel_compose.type = 0xff; - fail_on_test(doioctl(node, VIDIOC_S_SELECTION, &sel_compose) != s_sel_ret); + int s_sel_ret = doioctl(node, VIDIOC_S_SELECTION, &sel_compose); + fail_on_test(s_sel_ret != EINVAL && s_sel_ret != ENOTTY); // Check handling of invalid target. sel_compose.type = type; sel_compose.target = 0xffff; _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
