From patchwork Fri Nov 6 10:37:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 10380 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 4EE17BDB89 for ; Fri, 6 Nov 2020 10:38:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1D26262D47; Fri, 6 Nov 2020 11:38:32 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="olBz5WF3"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8B4CA62D43 for ; Fri, 6 Nov 2020 11:38:29 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1D4B0A19; Fri, 6 Nov 2020 11:38:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604659109; bh=zxwCrJq2+9Za9AFQUNJZwVcnzBDrZ/eEcWivbU1WSsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=olBz5WF3LA165wOBW31f4mvh58yqaU3XnnhEY0aYsRSDbUhNbN+EaJiawv4R/AnZj tFjYvaFm/1xwmYvs+uaZnUmWb9IkHUREEfaN47NvexzsCn0ibDYT47hs7eUta/lRal MhfpL1gNHU5+rxm78SAbmGMIHwEeZZ9jj2m0juaw= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 6 Nov 2020 19:37:02 +0900 Message-Id: <20201106103707.49660-33-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201106103707.49660-1-paul.elder@ideasonboard.com> References: <20201106103707.49660-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 32/37] tests: ipa_interface_test: Update to use new createIPA X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Update the IPA interface test to use the new createIPA function from IPAManager. Also declare ProcessManager, as it is not longer globally defined. Update meson.build to depend on the generated IPA interface headers. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- Changes in v4: - rename libcamera_generated_headers to libcamera_generated_ipa_headers Changes in v3: - declare ProcessManager - add libcamera_generated_headers as dependency to meson - otherwise test might build before the generated IPA headers and #include will fail New in v2 --- test/ipa/ipa_interface_test.cpp | 8 ++++++-- test/ipa/meson.build | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 67488409..db95a9e5 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -15,12 +15,14 @@ #include #include #include +#include #include #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/process.h" #include "libcamera/internal/thread.h" #include "test.h" @@ -95,7 +97,7 @@ protected: EventDispatcher *dispatcher = thread()->eventDispatcher(); Timer timer; - ipa_ = IPAManager::createIPA(pipe_.get(), 0, 0); + ipa_ = IPAManager::createIPA(pipe_.get(), 0, 0); if (!ipa_) { cerr << "Failed to create VIMC IPA interface" << endl; return TestFail; @@ -163,8 +165,10 @@ private: } } + ProcessManager processManager_; + std::shared_ptr pipe_; - std::unique_ptr ipa_; + std::unique_ptr ipa_; std::unique_ptr ipaManager_; enum IPAOperationCode trace_; EventNotifier *notifier_; diff --git a/test/ipa/meson.build b/test/ipa/meson.build index b25bfcf4..fce58a31 100644 --- a/test/ipa/meson.build +++ b/test/ipa/meson.build @@ -7,7 +7,7 @@ ipa_test = [ ] foreach t : ipa_test - exe = executable(t[0], t[1], + exe = executable(t[0], [t[1], libcamera_generated_ipa_headers], dependencies : libcamera_dep, link_with : test_libraries, include_directories : test_includes_internal)