diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/camera/camera_test.cpp | 3 | ||||
| -rw-r--r-- | test/controls/control_list.cpp | 3 | ||||
| -rw-r--r-- | test/list-cameras.cpp | 11 | ||||
| -rw-r--r-- | test/pipeline/ipu3/ipu3_pipeline_test.cpp | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp index 24ff5fe0..0e105414 100644 --- a/test/camera/camera_test.cpp +++ b/test/camera/camera_test.cpp @@ -14,7 +14,7 @@ using namespace std; int CameraTest::init() { - cm_ = CameraManager::instance(); + cm_ = new CameraManager(); if (cm_->start()) { cout << "Failed to start camera manager" << endl; @@ -44,4 +44,5 @@ void CameraTest::cleanup() } cm_->stop(); + delete cm_; }; diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp index c834edc3..f1d79ff8 100644 --- a/test/controls/control_list.cpp +++ b/test/controls/control_list.cpp @@ -21,7 +21,7 @@ class ControlListTest : public Test protected: int init() { - cm_ = CameraManager::instance(); + cm_ = new CameraManager(); if (cm_->start()) { cout << "Failed to start camera manager" << endl; @@ -203,6 +203,7 @@ protected: } cm_->stop(); + delete cm_; } private: diff --git a/test/list-cameras.cpp b/test/list-cameras.cpp index 070cbf2b..55551d7e 100644 --- a/test/list-cameras.cpp +++ b/test/list-cameras.cpp @@ -20,8 +20,8 @@ class ListTest : public Test protected: int init() { - cm = CameraManager::instance(); - cm->start(); + cm_ = new CameraManager(); + cm_->start(); return 0; } @@ -30,7 +30,7 @@ protected: { unsigned int count = 0; - for (const std::shared_ptr<Camera> &camera : cm->cameras()) { + for (const std::shared_ptr<Camera> &camera : cm_->cameras()) { cout << "- " << camera->name() << endl; count++; } @@ -40,11 +40,12 @@ protected: void cleanup() { - cm->stop(); + cm_->stop(); + delete cm_; } private: - CameraManager *cm; + CameraManager *cm_; }; TEST_REGISTER(ListTest) diff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp index 1d4cc4d4..8bfcd609 100644 --- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp +++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp @@ -92,7 +92,7 @@ int IPU3PipelineTest::init() enumerator.reset(nullptr); - cameraManager_ = CameraManager::instance(); + cameraManager_ = new CameraManager(); ret = cameraManager_->start(); if (ret) { cerr << "Failed to start the CameraManager" << endl; @@ -120,6 +120,7 @@ int IPU3PipelineTest::run() void IPU3PipelineTest::cleanup() { cameraManager_->stop(); + delete cameraManager_; } TEST_REGISTER(IPU3PipelineTest) |