selftests: media_tests: Add new subtest to video_device_test

Add new subtest to video_device_test to cover the VIDIOC_G_PRIORITY
and VIDIOC_S_PRIORITY ioctl calls. This test tries to set the priority
associated with the file descriptior via ioctl VIDIOC_S_PRIORITY
command from V4L2 API. After that, the test tries to get the new
priority via VIDIOC_G_PRIORITY ioctl command and compares the result
with the v4l2_priority it set before. At the end, the test restores the
old priority.

This test will increase the code coverage for video_device_test, so
I think it might be useful. Additionally, this patch will refactor the
video_device_test a little bit, according to the new functionality.

Signed-off-by: Ivan Orlov <ivan.orlov0322@gmail.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/media_tests/video_device_test.c b/tools/testing/selftests/media_tests/video_device_test.c
index 0f6aef2e2593204f4f3f0171655f6bd77e130cea..2c44e115f2f0627cd1587120ac67d996ea6d84f6 100644 (file)
--- a/tools/testing/selftests/media_tests/video_device_test.c
+++ b/tools/testing/selftests/media_tests/video_device_test.c
@@ -37,45 +37,58 @@
 #include <time.h>
 #include <linux/videodev2.h>
 
-int main(int argc, char **argv)
+#define PRIORITY_MAX 4
+
+int priority_test(int fd)
 {
-       int opt;
-       char video_dev[256];
-       int count;
-       struct v4l2_tuner vtuner;
-       struct v4l2_capability vcap;
+       /* This test will try to update the priority associated with a file descriptor */
+
+       enum v4l2_priority old_priority, new_priority, priority_to_compare;
        int ret;
-       int fd;
+       int result = 0;
 
-       if (argc < 2) {
-               printf("Usage: %s [-d </dev/videoX>]\n", argv[0]);
-               exit(-1);
+       ret = ioctl(fd, VIDIOC_G_PRIORITY, &old_priority);
+       if (ret < 0) {
+               printf("Failed to get priority: %s\n", strerror(errno));
+               return -1;
+       }
+       new_priority = (old_priority + 1) % PRIORITY_MAX;
+       ret = ioctl(fd, VIDIOC_S_PRIORITY, &new_priority);
+       if (ret < 0) {
+               printf("Failed to set priority: %s\n", strerror(errno));
+               return -1;
+       }
+       ret = ioctl(fd, VIDIOC_G_PRIORITY, &priority_to_compare);
+       if (ret < 0) {
+               printf("Failed to get new priority: %s\n", strerror(errno));
+               result = -1;
+               goto cleanup;
+       }
+       if (priority_to_compare != new_priority) {
+               printf("Priority wasn't set - test failed\n");
+               result = -1;
        }
 
-       /* Process arguments */
-       while ((opt = getopt(argc, argv, "d:")) != -1) {
-               switch (opt) {
-               case 'd':
-                       strncpy(video_dev, optarg, sizeof(video_dev) - 1);
-                       video_dev[sizeof(video_dev)-1] = '\0';
-                       break;
-               default:
-                       printf("Usage: %s [-d </dev/videoX>]\n", argv[0]);
-                       exit(-1);
-               }
+cleanup:
+       ret = ioctl(fd, VIDIOC_S_PRIORITY, &old_priority);
+       if (ret < 0) {
+               printf("Failed to restore priority: %s\n", strerror(errno));
+               return -1;
        }
+       return result;
+}
+
+int loop_test(int fd)
+{
+       int count;
+       struct v4l2_tuner vtuner;
+       struct v4l2_capability vcap;
+       int ret;
 
        /* Generate random number of interations */
        srand((unsigned int) time(NULL));
        count = rand();
 
-       /* Open Video device and keep it open */
-       fd = open(video_dev, O_RDWR);
-       if (fd == -1) {
-               printf("Video Device open errno %s\n", strerror(errno));
-               exit(-1);
-       }
-
        printf("\nNote:\n"
               "While test is running, remove the device or unbind\n"
               "driver and ensure there are no use after free errors\n"
@@ -98,4 +111,46 @@ int main(int argc, char **argv)
                sleep(10);
                count--;
        }
+       return 0;
+}
+
+int main(int argc, char **argv)
+{
+       int opt;
+       char video_dev[256];
+       int fd;
+       int test_result;
+
+       if (argc < 2) {
+               printf("Usage: %s [-d </dev/videoX>]\n", argv[0]);
+               exit(-1);
+       }
+
+       /* Process arguments */
+       while ((opt = getopt(argc, argv, "d:")) != -1) {
+               switch (opt) {
+               case 'd':
+                       strncpy(video_dev, optarg, sizeof(video_dev) - 1);
+                       video_dev[sizeof(video_dev)-1] = '\0';
+                       break;
+               default:
+                       printf("Usage: %s [-d </dev/videoX>]\n", argv[0]);
+                       exit(-1);
+               }
+       }
+
+       /* Open Video device and keep it open */
+       fd = open(video_dev, O_RDWR);
+       if (fd == -1) {
+               printf("Video Device open errno %s\n", strerror(errno));
+               exit(-1);
+       }
+
+       test_result = priority_test(fd);
+       if (!test_result)
+               printf("Priority test - PASSED\n");
+       else
+               printf("Priority test - FAILED\n");
+
+       loop_test(fd);
 }