NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

tests: v4l2_compat: Fix v4l2-compliance and v4l2-ctl version parsing

Browse source 
v4l2-compliance originally printed the SHA before the version, leading
to the indexing that was used previously. Now that the version is
printed before the SHA, the indexing is incorrect. Fix this.

Although v4l2-ctl doesn't suffer the same issue, it is more correct to
use the zeroth index like the v4l2-compliance version check now does, so
fix that as well.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Paul Elder 2020-07-14 15:02:10 +09:00
parent 49771c6dcc
commit c3548a333f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/v4l2_compat/v4l2_compat_test.py
View file

@ -94,7 +94,7 @@ def main(argv):
return TestSkip
ret, out = run_with_stdout(v4l2_compliance, '--version')
if (ret != 0 or version.parse(out[-2].split()[-1]) < MIN_V4L_UTILS_VERSION):
if ret != 0 or version.parse(out[0].split()[-1]) < MIN_V4L_UTILS_VERSION:
print('v4l2-compliance version >= 1.21.0 required')
return TestSkip
@ -104,7 +104,7 @@ def main(argv):
return TestSkip
ret, out = run_with_stdout(v4l2_ctl, '--version')
if (ret != 0 or version.parse(out[-2].split()[-1]) < MIN_V4L_UTILS_VERSION):
if ret != 0 or version.parse(out[0].split()[-1]) < MIN_V4L_UTILS_VERSION:
print('v4l2-ctl version >= 1.21.0 required')
return TestSkip