From 339e9b2d976cc726ee4ec7de78ab5b7978b2eb8e Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 30 May 2019 14:36:28 +0100 Subject: test: camera: Fix initialisation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Three tests {capture,configuration_set,statemachine} override the CameraTest::init() function, and call it as the first action. However they were not checking the return value, and each of the tests will segfault if the VIMC camera is not obtained. Check the return value of the CameraTest base class initialisation and return any errors to the test suite if initialisation fails. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Signed-off-by: Kieran Bingham --- test/camera/capture.cpp | 4 +++- test/camera/configuration_set.cpp | 4 +++- test/camera/statemachine.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'test/camera') diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index c0835c25..98e71905 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -42,7 +42,9 @@ protected: int init() override { - CameraTest::init(); + int ret = CameraTest::init(); + if (ret) + return ret; config_ = camera_->generateConfiguration({ StreamRole::VideoRecording }); if (!config_ || config_->size() != 1) { diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp index 9f10f795..f88da96c 100644 --- a/test/camera/configuration_set.cpp +++ b/test/camera/configuration_set.cpp @@ -18,7 +18,9 @@ class ConfigurationSet : public CameraTest protected: int init() override { - CameraTest::init(); + int ret = CameraTest::init(); + if (ret) + return ret; config_ = camera_->generateConfiguration({ StreamRole::VideoRecording }); if (!config_ || config_->size() != 1) { diff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp index d489f197..84d2a6fa 100644 --- a/test/camera/statemachine.cpp +++ b/test/camera/statemachine.cpp @@ -235,7 +235,9 @@ protected: int init() override { - CameraTest::init(); + int ret = CameraTest::init(); + if (ret) + return ret; defconf_ = camera_->generateConfiguration({ StreamRole::VideoRecording }); if (!defconf_) { -- cgit v1.2.1