summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2019-11-22 14:59:31 +0100
committerJacopo Mondi <jacopo@jmondi.org>2019-11-25 09:54:41 +0100
commita2a0e46576fb142147abfb94718831842fc39118 (patch)
treebf8ce3985616d07042a8ecd06beaadda5f88f353 /test
parenta8d03129033080c4c42a3f44792b9f7db206e300 (diff)
test: controls: control_list: Add status check
Since commit fac471e812a9 ("test: Extract CameraTest class out of camera tests to libtest") the control_list is a subclass of CameraTest, and the status returned by the base class init() operation should be inspected to avoid accessing uninitialized fields during the run() operation execution. If the VIMC test module is not loaded, executing the test results in a segfault. Fix this by adding the init() operation where to status_ flag is checked for errors. Fixes: fac471e812a9 ("test: Extract CameraTest class out of camera tests to libtest") Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'test')
-rw-r--r--test/controls/control_list.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp
index 4d212abd..5374c6f9 100644
--- a/test/controls/control_list.cpp
+++ b/test/controls/control_list.cpp
@@ -29,7 +29,12 @@ public:
}
protected:
- int run()
+ int init() override
+ {
+ return status_;
+ }
+
+ int run() override
{
CameraControlValidator validator(camera_.get());
ControlList list(controls::controls, &validator);