[libcamera-devel] [PATCH] tests: v4l2_compat: Fix v4l2-compliance and v4l2-ctl version parsing

Paul Elder paul.elder at ideasonboard.com
Wed Jul 15 16:29:57 CEST 2020


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 at ideasonboard.com>
---
 test/v4l2_compat/v4l2_compat_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/v4l2_compat/v4l2_compat_test.py b/test/v4l2_compat/v4l2_compat_test.py
index b054fe6..9867ece 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
 
-- 
2.27.0



More information about the libcamera-devel mailing list