From patchwork Fri Oct 2 14:31:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 9942 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 CB7C4C3B5C for ; Fri, 2 Oct 2020 14:33:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9CCAA63BE8; Fri, 2 Oct 2020 16:33:29 +0200 (CEST) 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="LryNyTSF"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B1FE63B98 for ; Fri, 2 Oct 2020 16:33:28 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 92673528; Fri, 2 Oct 2020 16:33:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1601649208; bh=H2JIAoSUznJO114Svyw/DBrw9YK4KvJqqZMj1g8baek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LryNyTSFK6lj92IIxviRDFfKWzn50dXHW2prmSm3nIYI1Fpj0juldeGV1+Wt/Nzma CziDFGAN/2kPAqMELVMo1+mzO6cfH4oa2o0M2X38QHWnth8ywluA2Zk4zvnt5l9vxZ DEhnnRbbzJPlfInwM/82wDc74IbEMWMJgXAmm2XA= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 2 Oct 2020 23:31:50 +0900 Message-Id: <20201002143154.468162-35-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201002143154.468162-1-paul.elder@ideasonboard.com> References: <20201002143154.468162-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 34/38] 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 --- 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 | 10 +++++++--- test/ipa/meson.build | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 1bc93a63..db95a9e5 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -14,13 +14,15 @@ #include #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..928987db 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_headers], dependencies : libcamera_dep, link_with : test_libraries, include_directories : test_includes_internal)