From patchwork Wed Jan 19 18:10:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106090 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 29338A0032; Wed, 19 Jan 2022 19:34:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1374F411C9; Wed, 19 Jan 2022 19:34:27 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 089E8411B5 for ; Wed, 19 Jan 2022 19:34:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617265; x=1674153265; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AmrkSoCYsnKla2GPB7FQFCtPRbvFa+8CaHp1U28fCW4=; b=LBimOWQx+L5srFhz8cIy9jdp/bd23rhKcfG0rUtNajiQmYpROd7GTvl3 3T+pciR/2Tl9oRoHalU0F/LuwNZsiiShH8vEUdUBzvvkrCDbvLCspkyOL rv1JvzoGpKxdIkzdNnQwVmmCAMiSge5ltnQV3wDfE6MTKJ/7kM29c1ON9 DwbJ7nnrtpHxf9z8mLIuOVw8cHDdpD8dd0H9r/AYSEMcyCbBDI1j+PjEP lgUs9hoCgSm/opMHhOCB9Iq7iMijjVu75BQ3D71Hy1EIvwcwbBqk7Xj7s hwwzRgdYkleMqOfQYqCRAgd99rtHzYX7NcS9DMiTfnBKKnSMr2x5EQ6qE g==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496623" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496623" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907393" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:29 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 5/6] build: add "packet framework" libs to optional list Date: Wed, 19 Jan 2022 18:10:01 +0000 Message-Id: <20220119181002.471195-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 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 Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- 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 a39dd68934..aac2b98800 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', @@ -229,7 +223,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], @@ -360,6 +353,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', ]