camera_V4L2: Remove raising failure for optional controls
Some controls are optional. We don't have to raise failure if one
of them is unsupported.
BUG=chromium:729885
TEST=pass camera_V4L2 on those failure devices
Change-Id: Ibc1b337c828878a02dff5b3b2c731092afb4de12
Reviewed-on: https://chromium-review.googlesource.com/525295
Commit-Ready: Heng-ruey Hsu <henryhsu@google.com>
Tested-by: Heng-ruey Hsu <henryhsu@google.com>
Reviewed-by: Wu-cheng Li <wuchengli@chromium.org>
diff --git a/client/site_tests/camera_V4L2/src/media_v4l2_unittest.cc b/client/site_tests/camera_V4L2/src/media_v4l2_unittest.cc
index be95473..97bdba6 100644
--- a/client/site_tests/camera_V4L2/src/media_v4l2_unittest.cc
+++ b/client/site_tests/camera_V4L2/src/media_v4l2_unittest.cc
@@ -100,19 +100,13 @@
printf("[Error] Can not open device '%s'\n", dev_name);
exit(EXIT_FAILURE);
}
- // Test mandatory controls.
- if (!ExerciseControl(&v4l2_dev, V4L2_CID_BRIGHTNESS, "brightness"))
- exit(EXIT_FAILURE);
- if (!ExerciseControl(&v4l2_dev, V4L2_CID_CONTRAST, "contrast"))
- exit(EXIT_FAILURE);
- if (!ExerciseControl(&v4l2_dev, V4L2_CID_SATURATION, "saturation"))
- exit(EXIT_FAILURE);
- if (!ExerciseControl(&v4l2_dev, V4L2_CID_GAMMA, "gamma"))
- exit(EXIT_FAILURE);
- if (!ExerciseControl(&v4l2_dev, V4L2_CID_HUE, "hue"))
- exit(EXIT_FAILURE);
// Test optional controls.
+ ExerciseControl(&v4l2_dev, V4L2_CID_BRIGHTNESS, "brightness");
+ ExerciseControl(&v4l2_dev, V4L2_CID_CONTRAST, "contrast");
+ ExerciseControl(&v4l2_dev, V4L2_CID_SATURATION, "saturation");
+ ExerciseControl(&v4l2_dev, V4L2_CID_GAMMA, "gamma");
+ ExerciseControl(&v4l2_dev, V4L2_CID_HUE, "hue");
ExerciseControl(&v4l2_dev, V4L2_CID_GAIN, "gain");
ExerciseControl(&v4l2_dev, V4L2_CID_SHARPNESS, "sharpness");
v4l2_dev.CloseDevice();