From patchwork Wed Jun 5 00:53:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 1357 Return-Path: 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 997AC64720 for ; Wed, 5 Jun 2019 02:53:34 +0200 (CEST) Received: from localhost.localdomain (unknown [96.44.9.117]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BDFEA2D1; Wed, 5 Jun 2019 02:53:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1559696014; bh=t2wkwpSghKHJ8pPXWQvy3esnWgO0patx4uwB6AJY3Ms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UWUlYnVj3J6segd38cb8Kln0tnu65y2EbaBbXocp8GwiC0ckebXeDq/cEQomXzrab ZPOe3SjaOkj3iSvGioqxnLnMzL9Fg4eUGzlP0fzOOus2g0498fwdU6HzyKJrYC51jH M83a6SZbIrJjNz4S2ZXkjGE05TjDj6zY/mgX/JTg= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 4 Jun 2019 20:53:15 -0400 Message-Id: <20190605005316.4835-10-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190605005316.4835-1-paul.elder@ideasonboard.com> References: <20190605005316.4835-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 09/10] libcamera: test: remove test IPA and use dummy IPA instead 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: Wed, 05 Jun 2019 00:53:34 -0000 Use the dummy IPA for testing/sample IPA instead of the earlier test IPA. Remove the test IPA, and update tests and meson accordingly. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- Changes in v3: - delete the unused test IPA shared object source Changes in v2: - use macros for defining the fields in the expected IPA module info test/ipa/ipa_test.cpp | 8 ++++---- test/ipa/meson.build | 10 ---------- test/ipa/shared_test.cpp | 14 -------------- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 test/ipa/shared_test.cpp diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp index 63e4243..bbef069 100644 --- a/test/ipa/ipa_test.cpp +++ b/test/ipa/ipa_test.cpp @@ -56,12 +56,12 @@ protected: const struct IPAModuleInfo testInfo = { IPA_MODULE_API_VERSION, - 9001, - "bleep", - "It's over nine thousand!", + 0, + "PipelineHandlerVimc", + "Dummy IPA for Vimc", }; - count += runTest("test/ipa/ipa-dummy-cpp.so", testInfo); + count += runTest("src/ipa/ipa_dummy.so", testInfo); if (count < 0) return TestFail; diff --git a/test/ipa/meson.build b/test/ipa/meson.build index 08ee95c..bca39fa 100644 --- a/test/ipa/meson.build +++ b/test/ipa/meson.build @@ -1,13 +1,3 @@ -ipa_modules_sources = [ - ['ipa-dummy-cpp', 'shared_test.cpp'], -] - -foreach m : ipa_modules_sources - shared_library(m, name_prefix : '', - dependencies : libcamera_dep, - include_directories : test_includes_public) -endforeach - ipa_test = [ ['ipa_test', 'ipa_test.cpp'], ] diff --git a/test/ipa/shared_test.cpp b/test/ipa/shared_test.cpp deleted file mode 100644 index 8bac439..0000000 --- a/test/ipa/shared_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include - -namespace libcamera { - -extern "C" { -const struct libcamera::IPAModuleInfo ipaModuleInfo = { - IPA_MODULE_API_VERSION, - 9001, - "bleep", - "It's over nine thousand!", -}; -}; - -}; /* namespace libcamera */