test: Extract CameraTest class out of camera tests to libtest
Many tests other than the camera/ tests use a camera. To increase code sharing, move the base CameraTest class to the test library. The class becomes a helper that doesn't inherit from Test anymore (to avoid diamond inheritance issues when more such helpers will exist). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
parent
6b3308ba1b
commit
fac471e812
10 changed files with 77 additions and 76 deletions
|
@ -18,6 +18,7 @@
|
|||
#include "v4l2_videodevice.h"
|
||||
|
||||
#include "camera_test.h"
|
||||
#include "test.h"
|
||||
|
||||
using namespace libcamera;
|
||||
|
||||
|
@ -254,11 +255,11 @@ private:
|
|||
bool done_;
|
||||
};
|
||||
|
||||
class BufferImportTest : public CameraTest
|
||||
class BufferImportTest : public CameraTest, public Test
|
||||
{
|
||||
public:
|
||||
BufferImportTest()
|
||||
: CameraTest()
|
||||
: CameraTest("VIMC Sensor B")
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -350,11 +351,10 @@ protected:
|
|||
|
||||
int init()
|
||||
{
|
||||
int ret = CameraTest::init();
|
||||
if (ret)
|
||||
return ret;
|
||||
if (status_ != TestPass)
|
||||
return status_;
|
||||
|
||||
ret = sink_.init();
|
||||
int ret = sink_.init();
|
||||
if (ret != TestPass) {
|
||||
cleanup();
|
||||
return ret;
|
||||
|
@ -422,8 +422,6 @@ protected:
|
|||
|
||||
camera_->stop();
|
||||
camera_->freeBuffers();
|
||||
|
||||
CameraTest::cleanup();
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue