summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2019-05-30 14:36:28 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2019-06-10 12:29:40 +0100
commit339e9b2d976cc726ee4ec7de78ab5b7978b2eb8e (patch)
treecff6ddbf0f25e06b0925ee96f006e2f6c191fcfb
parent255e58385784c7190194d4b8ba0523ad1e038ac4 (diff)
test: camera: Fix initialisation
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--test/camera/capture.cpp4
-rw-r--r--test/camera/configuration_set.cpp4
-rw-r--r--test/camera/statemachine.cpp4
3 files changed, 9 insertions, 3 deletions
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_) {