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 BE53FA0093; Thu, 13 Jan 2022 18:40:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B5364276B; Thu, 13 Jan 2022 18:39:57 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 103264275F for ; Thu, 13 Jan 2022 18:39:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642095596; x=1673631596; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C6H9ujrHxgDt2ZWgEMR/5TLdD2KO58W2+vDnam92Uac=; b=Nuvob1Mdnwqptq/wYWkbIy+oyM16pyJmb/dRu1F1DNnYPfGLqSeoPK2V WCLwMIgu2Eq3avDmIN6ZdJkQg89e3NomHuzo9Tii3tD6beveEH9bsYVSf gt35/If76lOXyJ48oE4/hEy936ZoTPIiSrHh7zYMqknH7nsNmnLBmVPfo 49bgWXYXrsglksuaBF3d/tBVfE/tURGYkJzB8rwXFTn1Dn12PfQ8hVcF5 ocYQ4KUgMegHIcwcw1/hbTkLxcvWm8PblFw7fVn5Imn+WhXGAgpe6qCXl mWN1FccOgrvGrk1Bg/cPdJ9eAaEhp2T66zwXLtKH05ZIotXXRFGFZiY2e g==; X-IronPort-AV: E=McAfee;i="6200,9189,10226"; a="244275501" X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="244275501" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2022 09:39:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="475418257" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga006.jf.intel.com with ESMTP; 13 Jan 2022 09:39:47 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 5/6] build: add "packet framework" libs to optional list Date: Thu, 13 Jan 2022 17:39:17 +0000 Message-Id: <20220113173918.2700651-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com> References: <20220113173918.2700651-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 Add port, table and pipeline libraries - collectively often known as the "packet framework" - to the list of optional libraries, and ensure tests can build with them disabled. Signed-off-by: Bruce Richardson --- app/test/meson.build | 20 +++++++++++++------- lib/meson.build | 3 +++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index a92dd0c1f0..ba62e5e98c 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -135,12 +135,6 @@ test_sources = files( 'test_stack.c', 'test_stack_perf.c', 'test_string_fns.c', - 'test_table.c', - 'test_table_acl.c', - 'test_table_combined.c', - 'test_table_pipeline.c', - 'test_table_ports.c', - 'test_table_tables.c', 'test_tailq.c', 'test_thash.c', 'test_thash_perf.c', @@ -227,7 +221,6 @@ fast_tests = [ ['stack_autotest', false], ['stack_lf_autotest', false], ['string_autotest', true], - ['table_autotest', true], ['tailq_autotest', true], ['ticketlock_autotest', true], ['timer_autotest', false], @@ -358,6 +351,19 @@ if dpdk_conf.has('RTE_LIB_TELEMETRY') test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c'] fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]] endif +if dpdk_conf.has('RTE_LIB_PIPELINE') +# pipeline lib depends on port and table libs, so those must be present +# if pipeline library is. + test_sources += [ + 'test_table.c', + 'test_table_acl.c', + 'test_table_combined.c', + 'test_table_pipeline.c', + 'test_table_ports.c', + 'test_table_tables.c', + ] + fast_tests += [['table_autotest', true]] +endif # The following linkages of drivers are required because # they are used via a driver-specific API. diff --git a/lib/meson.build b/lib/meson.build index ede5199374..dcc1b4d835 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -77,7 +77,10 @@ optional_libs = [ 'metrics', 'node', 'pdump', + 'pipeline', + 'port', 'power', + 'table', 'vhost', ] -- 2.32.0