From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7C3C5A0544; Mon, 10 Oct 2022 12:45:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FAF942B72; Mon, 10 Oct 2022 12:45:03 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 824B442B70 for ; Mon, 10 Oct 2022 12:45:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665398701; x=1696934701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=13YsscHoPartQ4LXdbyPB1GrEdx3H0s8Qze/GBOW8H4=; b=PLTOpaqs20jqT1ut7D2CITXGwlbBgWySlR9spioaMhds89iuSQ4Z9zQ8 BQNxG3zoe0LladaSUBeze3kTZaWexXBkgMRg8sySAi1W0789gnIRZxUv7 fnks2tSs+XcgbV1JDNlcwydH/y0H/wdov1CbKQIq5bjOV0TBL7VX2x19/ QSyF/9gqaT6mftSbMifFFzLTSNWCx1qcnmPBuuWLNv+LwQdWuNSJtTu5i EXYbvIg3LO4Vcy6kr/PaBZZ4S4WzpSZOM1/3sQzOOh5wkzMmLFtYMS73l rSFkJoo0CIxbHxy9ZjU8g+iB0hKYnKE9JmtseQ352yozmbmKGEqXydLBo w==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="283921432" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="283921432" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 03:45:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="954871963" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="954871963" Received: from silpixa00401385.ir.intel.com ([10.237.214.34]) by fmsmga005.fm.intel.com with ESMTP; 10 Oct 2022 03:45:00 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson Subject: [PATCH v3 3/3] devtools: enable kni library for test builds Date: Mon, 10 Oct 2022 11:44:48 +0100 Message-Id: <20221010104448.350578-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221010104448.350578-1-bruce.richardson@intel.com> References: <20221005143451.157613-1-bruce.richardson@intel.com> <20221010104448.350578-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org While KNI (or any other deprecated library) may be disabled by default, for build testing we need it enabled. Therefore explicitly set "disable_libs" build parameter to empty for any DPDK build where the value is not being explicitly set by the script. Signed-off-by: Bruce Richardson --- V3: Add disable_libs parameter clearing to CI jobs --- .ci/linux-build.sh | 2 ++ devtools/test-meson-builds.sh | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 06104eca22..14148fef4a 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -107,6 +107,8 @@ OPTS="$OPTS -Dcheck_includes=true" if [ "$MINI" = "true" ]; then OPTS="$OPTS -Denable_drivers=net/null" OPTS="$OPTS -Ddisable_libs=*" +else + OPTS="$OPTS -Ddisable_libs=" fi if [ "$ASAN" = "true" ]; then diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index e20a1c1df3..3a308bc9af 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -109,6 +109,11 @@ config () # return fi options= + # deprecated libs may be disabled by default, so for complete builds ensure + # no libs are disabled + if ! echo $* | grep -q -- 'disable_libs' ; then + options="$options -Ddisable_libs=" + fi if echo $* | grep -qw -- '--default-library=shared' ; then options="$options -Dexamples=all" else -- 2.34.1