From patchwork Mon Jun 3 23:16:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 1345 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 C169D618F9 for ; Tue, 4 Jun 2019 01:16:52 +0200 (CEST) Received: from localhost.localdomain (unknown [96.44.9.117]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0E76284; Tue, 4 Jun 2019 01:16:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1559603812; bh=sHLLuBNWxFbYSA4h91sOZVYyUfLGEs8Xoe6s7WHXwkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FgnbvTpRNPFlCN9q1qxsgW9VpcAHO/P7gbRMxHl9JNjTu0hijOdC5fghgFIjkzrH4 U3P5rhtfBcE0FO9zCjMwE6Kmz1HrRLCN7hoUvAW4piyZ0+c/uNEOmyiw2KuWWnDJQx Mj+PbyihSFErAdtDZaQeSrwg7XkPleD5ktiqKf0g= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Mon, 3 Jun 2019 19:16:35 -0400 Message-Id: <20190603231637.28554-9-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190603231637.28554-1-paul.elder@ideasonboard.com> References: <20190603231637.28554-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 08/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: Mon, 03 Jun 2019 23:16:53 -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 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/libtest/test.cpp | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp index d7b18c7..f401e29 100644 --- a/test/ipa/ipa_test.cpp +++ b/test/ipa/ipa_test.cpp @@ -59,12 +59,12 @@ protected: const struct IPAModuleInfo testInfo = { IPA_MODULE_API_VERSION, - PIPELINE_VERSION(0, 9001), - "bleep", - "It's over nine thousand!", + PIPELINE_VERSION(0, 1), + "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/libtest/test.cpp b/test/libtest/test.cpp index 451c111..a0c5102 100644 --- a/test/libtest/test.cpp +++ b/test/libtest/test.cpp @@ -21,7 +21,7 @@ int Test::execute() { int ret; - ret = setenv("IPA_MODULE_PATH", "test/ipa", 1); + ret = setenv("IPA_MODULE_PATH", "src/ipa", 1); if (ret) return errno;