From patchwork Tue Mar 17 17:31:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaaira Gupta X-Patchwork-Id: 3141 Return-Path: Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 96B1462923 for ; Tue, 17 Mar 2020 18:32:23 +0100 (CET) Received: by mail-pf1-x441.google.com with SMTP id f206so1318271pfa.10 for ; Tue, 17 Mar 2020 10:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=937pg80/2jSGNdf30pGtilFr29to8/0csaOJIrbvAUg=; b=tTbKdGef7s99K0RHj5xZ53cVVOCyQ5UTsmTfqgkU0Fw0Kfax/EIUi5c25Xu7cFAiEt 6PAmG4zwv1qG9WWjE85cEAvIf0L64p5ozsRH4IbUM7/EdhyGzF8mnf+bjk8jQZQHIKHm mnMYGIiD07j40jlS1QHawPSEkelXbHYhnQ7p46RYDLIRIcHIOBjpFoljPnYc9EBeYYSA +A552lQfNpdgGdYY2sW5c6AUfUL8ctEovnIE35EUysCiCgK3XBoy5m/8KlRIKxozhKyj 2jAH34wLez9Nfk4r4MphHYPuPDHk2UAqqwJZpmjaCJKOw7b6iJL/s2LNGanLAnhYNdGJ SQWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=937pg80/2jSGNdf30pGtilFr29to8/0csaOJIrbvAUg=; b=EB7JTJHiTBi2dYI4SEv9nBgk8isdQnyuOCGjYVhzIrCr3Um/38+t3bpTG/sAypaaZN f45UNdbUVWWRjCCxlmUB7F9KRplp3WlBlgHq2LrQh8BbrqXIzCgxUxl9BwEMxCio1+Ed onNe3CeVX8y/riYJLMk13DrkOQbfwFYfsCK/7ymP15SVQIPGj0BKSltQh0g7qZ78FM+P ofzXdHdeT4rLjs3aq6iL6jS+7mRzWrsf7EmpuhWWnka+X/O3CjoGwt0mdYNuVeFLsG9f zFNDAUcM3UeV1YkvvxX53Fea7jE1QxaGY6KZV14eugnkjh1uLTg65kddU50tA9msLDug LzWQ== X-Gm-Message-State: ANhLgQ3pGgwT6Q4sLydPcmwYxF7VNFazcuJKxPSEbuLWO/BhJmckTToo W5GSykrJnClG9XFnlC6h34gMtg== X-Google-Smtp-Source: ADFU+vuFeCZh4DEW5DbFML3gFikvH+0M9nCUq1lxbSaMbPizda0XR88KDIa0g82asP6fqSQE/HPvJw== X-Received: by 2002:a62:1dd0:: with SMTP id d199mr6663352pfd.9.1584466341826; Tue, 17 Mar 2020 10:32:21 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.153]) by smtp.gmail.com with ESMTPSA id 66sm3873965pfb.150.2020.03.17.10.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:32:21 -0700 (PDT) From: Kaaira Gupta To: libcamera-devel@lists.libcamera.org, kieran.bingham@ideasonboard.com, Helen Koike , Vaishali Thakkar Cc: Kaaira Gupta Date: Tue, 17 Mar 2020 23:01:42 +0530 Message-Id: <20200317173145.18226-2-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200317173145.18226-1-kgupta@es.iitr.ac.in> References: <20200317173145.18226-1-kgupta@es.iitr.ac.in> Subject: [libcamera-devel] [PATCH LIBCAMERA 1/4] libcamera: ipa_proxy: use utils::split() 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-List-Received-Date: Tue, 17 Mar 2020 17:32:23 -0000 Replace the manual string splitting with utils::split() Signed-off-by: Kaaira Gupta Reviewed-by: Kieran Bingham --- src/libcamera/ipa_proxy.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp index 5a3d2f1..e04117c 100644 --- a/src/libcamera/ipa_proxy.cpp +++ b/src/libcamera/ipa_proxy.cpp @@ -83,23 +83,16 @@ std::string IPAProxy::resolvePath(const std::string &file) const /* No exec target in install directory; check env variable. */ const char *execPaths = utils::secure_getenv("LIBCAMERA_IPA_PROXY_PATH"); - while (execPaths) { - const char *delim = strchrnul(execPaths, ':'); - size_t count = delim - execPaths; - - if (count) { - std::string proxyPath(execPaths, count); + if (execPaths) { + for (const auto &dir : utils::split(execPaths, ":")){ + if (dir.empty()) + continue; + std::string proxyPath = dir; proxyPath += proxyFile; if (!access(proxyPath.c_str(), X_OK)) return proxyPath; } - - if (*delim == '\0') - break; - - execPaths += count + 1; } - return std::string(); } From patchwork Tue Mar 17 17:31:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaaira Gupta X-Patchwork-Id: 3142 Return-Path: Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 34A4F62923 for ; Tue, 17 Mar 2020 18:32:29 +0100 (CET) Received: by mail-pl1-x641.google.com with SMTP id m1so1718202pll.6 for ; Tue, 17 Mar 2020 10:32:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hEIj/Skc1FVs8whHa+MH9fSiE8OXQz904mLGlCZLCvo=; b=EOVyr6KppWJnX40+5t0q/xcMuTgz9CcblrF9GhrTDFBFyXCFoS+Qe5qbuuDj03EyKt 7mmd0oNaBO+BkUBSiQWjZCjf/L5hTKplI82/kM1TCjWVj3bbEGRWsFaHNVQW44GjryzN XFI2qyn9pfR9xEdwc39phg+ZaMrscCML6xSHyrMMtLYWrmcLfsKlGRgFz0nojX9xRPKV yDjnd43AwR06hEC0RfU9q0xUM0aHpP2W1EVw5xrC1oXdzuVdYe5w8IQmsWea9Mn2mcXo nWjUpSRiQOxHGbMaw+t0ExpRG6HKep1s2x5vwU+1RczGX7wMDbzrvJ7KknlgjNXcpE2+ jD+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hEIj/Skc1FVs8whHa+MH9fSiE8OXQz904mLGlCZLCvo=; b=ZWiyXJizfER1sa/Bhd/uPt2kCVQWLhhTSOGsGuqLZxGmhzmi0bSmhCKbSnqAUa1sSl 2WWU499RGT6h5oub6Uqym6bJljPqiwWBKF8NlnXCt31Jyj+TLPNUqCUubdqUCzqtE2zv XBaLllcy3Ols4fmOwpYshR0Vj0NeMaO4JBLa7PVvyGrLWA7wZ+hp5kH0AeebS9NuA6mC z58X+OfU1wl75jAaJAYJeB95mAcjIEd0OXYERoOBO/qyL6YVbQ+okCgfpPRtVSULpU/A bmuF+3LldBnRVpyjFj3JWuIe+AWQ0xV2k5cQZFB9VpC78VvI6M/iCdOEgQn7dHhKexBa Fybw== X-Gm-Message-State: ANhLgQ3o8U7gFcCp4p3Dh3kvlD2jiwkSGai5/KMP8YOoPfcuZQ13Fx9S hoqUWhQ/UmMC5B2ENt4oC3+zeJEZQ3o= X-Google-Smtp-Source: ADFU+vt319Y2agoaTDvNI27xetX0RPgWWMPnIZdGgx8yw0mS9iObh+xvdrD/58y5q342Oay/SBh40w== X-Received: by 2002:a17:90a:5801:: with SMTP id h1mr286869pji.121.1584466347750; Tue, 17 Mar 2020 10:32:27 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.153]) by smtp.gmail.com with ESMTPSA id z16sm3825126pfr.138.2020.03.17.10.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:32:27 -0700 (PDT) From: Kaaira Gupta To: libcamera-devel@lists.libcamera.org, kieran.bingham@ideasonboard.com, Helen Koike , Vaishali Thakkar Cc: Kaaira Gupta Date: Tue, 17 Mar 2020 23:01:43 +0530 Message-Id: <20200317173145.18226-3-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200317173145.18226-1-kgupta@es.iitr.ac.in> References: <20200317173145.18226-1-kgupta@es.iitr.ac.in> Subject: [libcamera-devel] [PATCH LIBCAMERA 2/4] libcamera: ipa_proxy: rearrange proxies precedence 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-List-Received-Date: Tue, 17 Mar 2020 17:32:29 -0000 User environment path in LIBCAMERA_IPA_PROXY_PATH should take precedence over system loading locations. Change precedence accordingly. Signed-off-by: Kaaira Gupta Reviewed-by: Kieran Bingham --- src/libcamera/ipa_proxy.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp index e04117c..363d034 100644 --- a/src/libcamera/ipa_proxy.cpp +++ b/src/libcamera/ipa_proxy.cpp @@ -75,13 +75,8 @@ IPAProxy::~IPAProxy() */ std::string IPAProxy::resolvePath(const std::string &file) const { - /* Try finding the exec target from the install directory first */ std::string proxyFile = "/" + file; - std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile; - if (!access(proxyPath.c_str(), X_OK)) - return proxyPath; - - /* No exec target in install directory; check env variable. */ + /* Check env variable first. */ const char *execPaths = utils::secure_getenv("LIBCAMERA_IPA_PROXY_PATH"); if (execPaths) { for (const auto &dir : utils::split(execPaths, ":")){ @@ -93,6 +88,12 @@ std::string IPAProxy::resolvePath(const std::string &file) const return proxyPath; } } + + /*Try finding the exec target from the install directory.*/ + std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile; + if (!access(proxyPath.c_str(), X_OK)) + return proxyPath; + return std::string(); } From patchwork Tue Mar 17 17:31:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaaira Gupta X-Patchwork-Id: 3143 Return-Path: Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 442B962923 for ; Tue, 17 Mar 2020 18:32:35 +0100 (CET) Received: by mail-pf1-x430.google.com with SMTP id b72so12311996pfb.11 for ; Tue, 17 Mar 2020 10:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KrtPCqHQs+csT3TD5XmQcU1mNeju6IYSHxiln/8Vwk4=; b=TdJqvbXM27ujr7k1ASvreKqZOX9AzLts1tC+kqO4ZyCPc+4nXRUieMaGCTb77Vlmtd xhneuenxLyj5oq6aVU3LI9WIXbrZC0donelQs04S2c6g8islZGNW5sSXAHqQ6R6A34Ge hOhBfvDlT9GV0MqMrGjAmDHJiarg9g1kilmSQehugpipnpD9LXFgrxxLBrV/OKXnid10 9rRpizF3z8pg25kfuS2b+6M0DFIZnImewPWWTg3+dYdO++mGaaX2EbPPHv9aEwbGyOII Eh9kV3xBfvR42pwuc+LRYOdxy53E+hrMLWEOfGM0k/KE+WZufhIKBP3RX4mr8/3UqrlV Tz/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KrtPCqHQs+csT3TD5XmQcU1mNeju6IYSHxiln/8Vwk4=; b=ZhxN57t4f0/1qQzstmaKbZG2y0TrAeJOLnFbAKItcPceOCEaI9wLKd1dl/qWGsdCOa jwg0HVfA/4S4BUr316pAvtj0SXwU/9tY+bCdlsQuJIHP91IC0cZcLG1fMJXnpiRTuAmc VmB3bvVWuTMOwcvVU4YdSMvgzCfjGZHERugiZLHoVL9QQ28DstnAzJ8R6oTRjsx7BkR8 2kRCJUCTrsvOLEEi6zr43iAC1aYXU7c45aH5FRgPv7wvMI0NG+mudim4zMiStu6pc3Rj pdlaM7pGDNvMAoKUM8yQa+EWFbOel/fk6WzCg/D2ZW2WfcK/UM8G3eYoN0cFSA66/pjH 3qEg== X-Gm-Message-State: ANhLgQ3hwYMI3z/eszrSOMIwqfCTjYtPITQiF2vu71OLUXMigkB7Os0l qx8DPi1pdlZVMse9PRl/tqqCnw== X-Google-Smtp-Source: ADFU+vtatYKgzKXA9N9n1e9rVBE+LWqO3viayzgUZHX0P/kHU6PwWxcX0lyINDwok+SJjun/AC5dag== X-Received: by 2002:a63:4cc:: with SMTP id 195mr290250pge.93.1584466353853; Tue, 17 Mar 2020 10:32:33 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.153]) by smtp.gmail.com with ESMTPSA id v1sm52049pjy.35.2020.03.17.10.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:32:33 -0700 (PDT) From: Kaaira Gupta To: libcamera-devel@lists.libcamera.org, kieran.bingham@ideasonboard.com, Helen Koike , Vaishali Thakkar Cc: Kaaira Gupta Date: Tue, 17 Mar 2020 23:01:44 +0530 Message-Id: <20200317173145.18226-4-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200317173145.18226-1-kgupta@es.iitr.ac.in> References: <20200317173145.18226-1-kgupta@es.iitr.ac.in> Subject: [libcamera-devel] [PATCH LIBCAMERA 3/4] libcamera: ipa_proxy: search for proxy in build tree 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-List-Received-Date: Tue, 17 Mar 2020 17:32:35 -0000 When libcamera is build and tested before installing, it will be unable to locate the path to proxy files,or previously installed files in the system path may be incorrect to load. Hence, when libcamera is not installed and running from a build tree, identify the location of that tree by finding the path of active libcamera.so, and from that point add the relative path to the proxy file. Signed-off-by: Kaaira Gupta --- src/libcamera/ipa_proxy.cpp | 54 +++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp index 363d034..d7c32a1 100644 --- a/src/libcamera/ipa_proxy.cpp +++ b/src/libcamera/ipa_proxy.cpp @@ -9,7 +9,9 @@ #include #include - +#include +#include +#include #include "log.h" #include "utils.h" @@ -20,6 +22,35 @@ * \brief IPA Proxy */ +static bool isLibcameraInstalled() +{ + /* musl doesn't declare _DYNAMIC in link.h, declare it manually. */ + extern ElfW(Dyn) _DYNAMIC[]; + + /* + * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on + * install. + */ + for (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) { + if (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH) + return false; + } + + return true; +} + +static std::string libcameraPath() +{ + Dl_info info; + + /* Look up our own symbol. */ + int ret = dladdr(reinterpret_cast(libcameraPath), &info); + if (ret == 0) + return nullptr; + + return info.dli_fname; +} + namespace libcamera { LOG_DEFINE_CATEGORY(IPAProxy) @@ -89,10 +120,23 @@ std::string IPAProxy::resolvePath(const std::string &file) const } } - /*Try finding the exec target from the install directory.*/ - std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile; - if (!access(proxyPath.c_str(), X_OK)) - return proxyPath; + /* + *When libcamera is used before it is installed, load proxies from the + *same build directory as the libcamera directory itself. This requires + *identifying the path of the libcamera.so, and referencing a relative + *path for the proxies from that point. + */ + if (!isLibcameraInstalled()){ + std::string ipaProxyDir = utils::dirname(libcameraPath()) + "/../../proxy"; + + LOG(IPAProxy, Info) + << "libcamera is not installed. Adding '" + << ipaProxyDir << "' to the Proxy search path"; + + std::string proxyPath = ipaProxyDir + proxyFile; + if (!access(proxyPath.c_str(), X_OK)) + return proxyPath; + } return std::string(); } From patchwork Tue Mar 17 17:31:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaaira Gupta X-Patchwork-Id: 3144 Return-Path: Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1E0D862923 for ; Tue, 17 Mar 2020 18:32:41 +0100 (CET) Received: by mail-pl1-x642.google.com with SMTP id g6so9925254plt.2 for ; Tue, 17 Mar 2020 10:32:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q+/gkTXzUvkd9cyfeBi7bBC80hcBn5fLvLaWGonCDm0=; b=v8I/MsskR1B4YNqt1oniFYrwKQ7pJeRt1r6CYBYcm5XtOuQnH6cSx7X9PmlCKUJCKm qJwDpPpC45yjIlP6UDdJoeW6BGByWMwpSvaPvuFwMd9CcB+BI+GCfQ66J8ikZJB9aLxU 0Czi3iiI2szwRYwtrFsPV33nQO7SJSwAs9AxpJAImExdOZ4ssx6IBMhPmkVlpVsQPjT8 bxHc2QUs8zW0VwzU0wIJ2/mL2mZnSZ+l+v4EJIXrl8X2gmz3rr+Te3PqC3nEIyXEEaae 30c9R3oOlPUumTmCp/0HGr7KQrKPgMZ0XtZK3wrEyK6qxUrgwR6oVQ1dfkYr/hAM8vRX h46Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Q+/gkTXzUvkd9cyfeBi7bBC80hcBn5fLvLaWGonCDm0=; b=Y4QjYxbZdXGnENOuEi+l+ffF7QbrcNqI08Bd1wEq+8UoCcuKmWF7YhO6BulrF3oJGj rjXP5/Md4DUw0zEX2WYrNYFgxtHafB6BG3hVgfzQ/m8w8fGBkAF9JH2iWysDz/yFmkkC KrP+X6UcRZL5UbmZ32+z/aHT4RrN8PVWpsDyFJy+dj0G5dcOIK3LxFy3LPLi1MEeRuhk 4W3qyuJzcRzLZw1l8r+Q6YN9nz9YyyO3faTC8KPXHSsbAIPSWZ8vyy0KeWEiQLVIYuG8 G7npPNpsBsp42R9dEyFZ16JDbyOVyoyYQl0dCH37/TSuS24HtQLhigGvGE/cG+nO7Ru1 nnww== X-Gm-Message-State: ANhLgQ12Qje2PvpLsUVJXWmpG92i6oHUqQKqqUew6pp+E3j+eCzRaA+C tqJUqjB6pXGTcjIy/0ZT9xWWW5umM/U= X-Google-Smtp-Source: ADFU+vuVdl0e3ul3hhqidREn0HWFFjMsLwVr2VApvtf6tQxiN9fP1IP0525uwvpOvbuB2nd9Gk/W+Q== X-Received: by 2002:a17:90a:730b:: with SMTP id m11mr276487pjk.195.1584466359704; Tue, 17 Mar 2020 10:32:39 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.153]) by smtp.gmail.com with ESMTPSA id q8sm70516pje.2.2020.03.17.10.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:32:39 -0700 (PDT) From: Kaaira Gupta To: libcamera-devel@lists.libcamera.org, kieran.bingham@ideasonboard.com, Helen Koike , Vaishali Thakkar Cc: Kaaira Gupta Date: Tue, 17 Mar 2020 23:01:45 +0530 Message-Id: <20200317173145.18226-5-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200317173145.18226-1-kgupta@es.iitr.ac.in> References: <20200317173145.18226-1-kgupta@es.iitr.ac.in> Subject: [libcamera-devel] [PATCH LIBCAMERA 4/4] tests: remove IPA_PROXY_PATH environment variable 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-List-Received-Date: Tue, 17 Mar 2020 17:32:41 -0000 The tests declare a hard-coded LIBCAMERA_IPA_PROXY_PATH to allow tests to run from the tests-suite. Now that the proxy path is determined at runtime, we can remove the redundant setting of LIBCAMERA_IPA_PROXY_PATH for tests. Signed-off-by: Kaaira Gupta Reviewed-by: Kieran Bingham --- test/libtest/test.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/libtest/test.cpp b/test/libtest/test.cpp index 6cd3fbe..fd9f3d7 100644 --- a/test/libtest/test.cpp +++ b/test/libtest/test.cpp @@ -21,10 +21,6 @@ int Test::execute() { int ret; - ret = setenv("LIBCAMERA_IPA_PROXY_PATH", "src/libcamera/proxy/worker", 1); - if (ret) - return errno; - ret = init(); if (ret) return ret;