aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-08-14 11:12:10 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-08-14 11:12:10 +0200
commit263ec7b08128c721912f3407cce696f364ab1178 (patch)
tree8b5225cc0dd44c2df6ffcc14a858290193bc5c0e
parent78e4b293f654df1f273bbc6b1213511f53a2a465 (diff)
v4l2-compliance: some fails were ignored
Some test failures in lower-level tests were ignored. This caused the total 'Failed' counter to remain 0, which was confusing. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--utils/v4l2-compliance/v4l2-test-formats.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/utils/v4l2-compliance/v4l2-test-formats.cpp b/utils/v4l2-compliance/v4l2-test-formats.cpp
index b865e596..d771dc4a 100644
--- a/utils/v4l2-compliance/v4l2-test-formats.cpp
+++ b/utils/v4l2-compliance/v4l2-test-formats.cpp
@@ -1628,8 +1628,12 @@ int testCropping(struct node *node)
fail_on_test(testLegacyCrop(node));
if (node->can_capture && node->is_video)
ret_cap = testBasicSelection(node, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_SEL_TGT_CROP);
+ if (ret_cap && ret_cap != ENOTTY)
+ return ret_cap;
if (node->can_output && node->is_video)
ret_out = testBasicSelection(node, V4L2_BUF_TYPE_VIDEO_OUTPUT, V4L2_SEL_TGT_CROP);
+ if (ret_out && ret_out != ENOTTY)
+ return ret_out;
if ((!node->can_capture && !node->can_output) || !node->is_video) {
struct v4l2_selection sel = {
V4L2_BUF_TYPE_VIDEO_CAPTURE,
@@ -1935,7 +1939,7 @@ int testScaling(struct node *node)
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :
V4L2_BUF_TYPE_VIDEO_CAPTURE);
fail_on_test(doioctl(node, VIDIOC_G_FMT, &fmt));
- testBasicScaling(node, fmt);
+ fail_on_test(testBasicScaling(node, fmt));
fail_on_test(doioctl(node, VIDIOC_S_FMT, &fmt));
}
if (node->can_output) {
@@ -1943,7 +1947,7 @@ int testScaling(struct node *node)
V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE :
V4L2_BUF_TYPE_VIDEO_OUTPUT);
fail_on_test(doioctl(node, VIDIOC_G_FMT, &fmt));
- testBasicScaling(node, fmt);
+ fail_on_test(testBasicScaling(node, fmt));
fail_on_test(doioctl(node, VIDIOC_S_FMT, &fmt));
}
return node->can_scale ? 0 : ENOTTY;

Privacy Policy