summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@ideasonboard.com>2020-07-14 15:02:10 +0900
committerPaul Elder <paul.elder@ideasonboard.com>2020-07-17 18:50:10 +0900
commitc3548a333f86d31213ca9f2ccc3faf743b246743 (patch)
tree725065874aed26581217c846e1353bea535c9d92
parent49771c6dccb28228839b5e88ada36bd6646bf933 (diff)
tests: v4l2_compat: Fix v4l2-compliance and v4l2-ctl version parsing
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>
-rwxr-xr-xtest/v4l2_compat/v4l2_compat_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/v4l2_compat/v4l2_compat_test.py b/test/v4l2_compat/v4l2_compat_test.py
index b054fe65..51bfa952 100755
--- a/test/v4l2_compat/v4l2_compat_test.py
+++ b/test/v4l2_compat/v4l2_compat_test.py
@@ -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