From patchwork Sat May 11 11:11:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 1200 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 369BD60E4F for ; Sat, 11 May 2019 13:11:43 +0200 (CEST) X-Halon-ID: 881011c0-73dd-11e9-81fd-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from localhost.localdomain (unknown [185.224.57.161]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 881011c0-73dd-11e9-81fd-0050569116f7; Sat, 11 May 2019 13:11:33 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sat, 11 May 2019 13:11:13 +0200 Message-Id: <20190511111115.16727-4-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190511111115.16727-1-niklas.soderlund@ragnatech.se> References: <20190511111115.16727-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 3/5] test: v4l2_device: Allow each test to specify which device and entity to test X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 May 2019 11:11:43 -0000 Prepare for different tests which implements V4L2DeviceTest to specify which media device and entity they wish to test. There is no functional changes, all tests still use vivid to perform there tests. Signed-off-by: Niklas Söderlund Acked-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- test/v4l2_device/buffer_sharing.cpp | 5 ++--- test/v4l2_device/capture_async.cpp | 2 +- test/v4l2_device/double_open.cpp | 3 +++ test/v4l2_device/formats.cpp | 3 +++ test/v4l2_device/request_buffers.cpp | 4 ++++ test/v4l2_device/stream_on_off.cpp | 3 +++ test/v4l2_device/v4l2_device_test.cpp | 6 +++--- test/v4l2_device/v4l2_device_test.h | 6 ++++-- 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/test/v4l2_device/buffer_sharing.cpp b/test/v4l2_device/buffer_sharing.cpp index 09695239ee4b9e80..e63ddff856894130 100644 --- a/test/v4l2_device/buffer_sharing.cpp +++ b/test/v4l2_device/buffer_sharing.cpp @@ -23,9 +23,8 @@ class BufferSharingTest : public V4L2DeviceTest { public: BufferSharingTest() - : output_(nullptr), framesCaptured_(0), framesOutput_(0) - { - } + : V4L2DeviceTest("vivid", "vivid-000-vid-cap"), + output_(nullptr), framesCaptured_(0), framesOutput_(0) {} protected: int init() diff --git a/test/v4l2_device/capture_async.cpp b/test/v4l2_device/capture_async.cpp index 2a41b11e95e77dac..fd428ff909f32999 100644 --- a/test/v4l2_device/capture_async.cpp +++ b/test/v4l2_device/capture_async.cpp @@ -18,7 +18,7 @@ class CaptureAsyncTest : public V4L2DeviceTest { public: CaptureAsyncTest() - : frames(0){}; + : V4L2DeviceTest("vivid", "vivid-000-vid-cap"), frames(0) {} void receiveBuffer(Buffer *buffer) { diff --git a/test/v4l2_device/double_open.cpp b/test/v4l2_device/double_open.cpp index 7ec80a60f57ee036..b402de04fca5ddbb 100644 --- a/test/v4l2_device/double_open.cpp +++ b/test/v4l2_device/double_open.cpp @@ -13,6 +13,9 @@ namespace { class DoubleOpen : public V4L2DeviceTest { +public: + DoubleOpen() + : V4L2DeviceTest("vivid", "vivid-000-vid-cap") {} protected: int run() { diff --git a/test/v4l2_device/formats.cpp b/test/v4l2_device/formats.cpp index 72676c9d334a69b0..3ac47f5cc665b62b 100644 --- a/test/v4l2_device/formats.cpp +++ b/test/v4l2_device/formats.cpp @@ -17,6 +17,9 @@ using namespace libcamera; class Format : public V4L2DeviceTest { +public: + Format() + : V4L2DeviceTest("vivid", "vivid-000-vid-cap") {} protected: int run() { diff --git a/test/v4l2_device/request_buffers.cpp b/test/v4l2_device/request_buffers.cpp index 938d4f85d5a1e711..794b083eb84d8d2e 100644 --- a/test/v4l2_device/request_buffers.cpp +++ b/test/v4l2_device/request_buffers.cpp @@ -9,6 +9,10 @@ class RequestBuffersTest : public V4L2DeviceTest { +public: + RequestBuffersTest() + : V4L2DeviceTest("vivid", "vivid-000-vid-cap") {} + protected: int run() { diff --git a/test/v4l2_device/stream_on_off.cpp b/test/v4l2_device/stream_on_off.cpp index ea1b3f5bd5a4cbea..4902d5fd6d58a73d 100644 --- a/test/v4l2_device/stream_on_off.cpp +++ b/test/v4l2_device/stream_on_off.cpp @@ -9,6 +9,9 @@ class StreamOnStreamOffTest : public V4L2DeviceTest { +public: + StreamOnStreamOffTest() + : V4L2DeviceTest("vivid", "vivid-000-vid-cap") {} protected: int run() { diff --git a/test/v4l2_device/v4l2_device_test.cpp b/test/v4l2_device/v4l2_device_test.cpp index 833038d56ea4631d..ee5a8e009bef2a5e 100644 --- a/test/v4l2_device/v4l2_device_test.cpp +++ b/test/v4l2_device/v4l2_device_test.cpp @@ -39,14 +39,14 @@ int V4L2DeviceTest::init() return TestFail; } - DeviceMatch dm("vivid"); - dm.add("vivid-000-vid-cap"); + DeviceMatch dm(driver_); + dm.add(entity_); media_ = enumerator_->search(dm); if (!media_) return TestSkip; - MediaEntity *entity = media_->getEntityByName("vivid-000-vid-cap"); + MediaEntity *entity = media_->getEntityByName(entity_); if (!entity) return TestSkip; diff --git a/test/v4l2_device/v4l2_device_test.h b/test/v4l2_device/v4l2_device_test.h index c476d3c05e79747a..651c005f4e5485e6 100644 --- a/test/v4l2_device/v4l2_device_test.h +++ b/test/v4l2_device/v4l2_device_test.h @@ -22,8 +22,8 @@ using namespace libcamera; class V4L2DeviceTest : public Test { public: - V4L2DeviceTest() - : capture_(nullptr) + V4L2DeviceTest(const char *driver, const char *entity) + : driver_(driver), entity_(entity), capture_(nullptr) { } @@ -31,6 +31,8 @@ protected: int init(); void cleanup(); + std::string driver_; + std::string entity_; std::unique_ptr enumerator_; std::shared_ptr media_; V4L2Device *capture_;