From patchwork Wed Sep 14 10:58:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 17367 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 65519C0DA4 for ; Wed, 14 Sep 2022 10:59:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DC47761FA8; Wed, 14 Sep 2022 12:59:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1663153148; bh=1XbmHz3RYSr2zdnaHZ4YKl0EuHIWqeSNAlCpqqd05RA=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ovWlLESnr8dbeweuHahYYQoDTjnXbMKMixrKCdarKhrZ18twVQDcKVHVbEkt0QKjG v3vP0YYDuLoLFFtXrvSIfIWycfzDMTWAltv0YE0UGRgOLB29BpxFLcTvvdPZQCVsrm TN4Vx3zzqauH7FwiyMCMr8Kgd9uaU4h81VD4on3epMAsN3pnX2KK2BP81PHNsz2Puq 6DVTiTz4/aSRBPzlmWjrWMvK3NOgWiDW7DCp7NzLSTKU5OKirzrhFk/5ObeboIn9R2 2LeY8HTznYjWzG4gstZ1A/LE3B5P2eo8kOuWIllsNFkrbQ5WjJbPTDYfB/wnk57ZVV iWE6vWMNiokjg== 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 7F6546099F for ; Wed, 14 Sep 2022 12:59:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ryGZWH6x"; dkim-atps=neutral Received: from umang.jainideasonboard.com (unknown [103.251.226.115]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C3CC8305; Wed, 14 Sep 2022 12:59:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1663153147; bh=1XbmHz3RYSr2zdnaHZ4YKl0EuHIWqeSNAlCpqqd05RA=; h=From:To:Cc:Subject:Date:From; b=ryGZWH6xbhXvtromG0nAcyHa+e7IzFbMdKdPfVytWUBU7/Qb1trgbpM1DlsPiW1Pb 1hghIRNJMlIxOwnUgwvRQgkDHaUR2/PEGJoTI5yM677yo1+Sh5O1G3AuKTbngk2XnI WCoH3RiHi/sh//la26twNO0xpU6fjKX7xB7YhYjc= To: libcamera-devel@lists.libcamera.org Date: Wed, 14 Sep 2022 16:28:59 +0530 Message-Id: <20220914105859.124524-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] meson: Enable vimc IPA for tests 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: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Vimc pipeline handler is enabled unconditionally if the meson config option '-Dtest' is true. However, this is not true for the vimc IPA. Hence, a meson configuration such as: -Dpipelines=raspberrypi -Dipas=raspberrypi -Dtest=true will include the vimc pipeline handler (in addition to raspberrypi) but will skip the vimc IPA which can lead to failure of unit tests that depends on vimc to execute. One such unit test was identified as a result of this issue on RaspberryPi: ERROR IPAModule ipa_module.cpp:278 ipa_vimc.so: Failed to open IPA library: No such file or directory test IPA module src/ipa/vimc/ipa_vimc.so is invalid due to the non-existent ipa_vimc.so. Fix this by including the vimc IPA unconditionally when the tests are enabled, similar to how the vim pipeline-handler is included. Fixes: 6e65d4225736 ("libcamera: Enable vimc pipeline handler when tests are enabled") Signed-off-by: Umang Jain Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- src/ipa/meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 849bb372..e972bbe8 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -27,6 +27,14 @@ ipa_sign = files('ipa-sign.sh') ipa_names = [] ipa_modules = get_option('ipas') + +# Tests require the vimc IPA, similar to vimc pipline-handler for their +# execution. Include it automatically when tests are enabled. +if get_option('test') and 'vimc' not in ipa_modules + message('Enabling vimc IPA to support tests') + ipa_modules += ['vimc'] +endif + enabled_ipa_modules = [] # The ipa-sign-install.sh script which uses the ipa_names variable will itself