DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH 5/6] build: add "packet framework" libs to optional list
Date: Thu, 13 Jan 2022 17:39:17 +0000	[thread overview]
Message-ID: <20220113173918.2700651-6-bruce.richardson@intel.com> (raw)
In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com>

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 <bruce.richardson@intel.com>
---
 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


  parent reply	other threads:[~2022-01-13 17:40 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-13 17:39 [PATCH 0/6] allow more DPDK libraries to be disabled on build Bruce Richardson
2022-01-13 17:39 ` [PATCH 1/6] lib: allow recursive disabling of libs in build Bruce Richardson
2022-01-13 17:39 ` [PATCH 2/6] app/test: link unit test binary against all available libs Bruce Richardson
2022-01-19 16:51   ` David Marchand
2022-01-19 17:25     ` Bruce Richardson
2022-01-13 17:39 ` [PATCH 3/6] build: add node library to optional list Bruce Richardson
2022-01-13 17:39 ` [PATCH 4/6] build: add flow classification " Bruce Richardson
2022-01-13 17:39 ` Bruce Richardson [this message]
2022-01-13 17:39 ` [PATCH 6/6] build: add cfgfile " Bruce Richardson
2022-01-13 18:26 ` [PATCH 0/6] allow more DPDK libraries to be disabled on build Stephen Hemminger
2022-01-14  8:07 ` Morten Brørup
2022-01-19 16:52 ` David Marchand
2022-01-19 18:09 ` [PATCH v2 0/6] allow more DPDK libs " Bruce Richardson
2022-01-19 18:09   ` [PATCH v2 1/6] lib: allow recursive disabling of libs in build Bruce Richardson
2022-01-19 18:09   ` [PATCH v2 2/6] app/test: link unit test binary against all available libs Bruce Richardson
2022-01-19 18:09   ` [PATCH v2 3/6] build: add node library to optional list Bruce Richardson
2022-01-19 18:10   ` [PATCH v2 4/6] build: add flow classification " Bruce Richardson
2022-01-19 18:10   ` [PATCH v2 5/6] build: add "packet framework" libs " Bruce Richardson
2022-01-19 18:10   ` [PATCH v2 6/6] build: add cfgfile library " Bruce Richardson
2022-01-20 10:53   ` [PATCH v2 0/6] allow more DPDK libs to be disabled on build David Marchand
2022-01-21 13:04   ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220113173918.2700651-6-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).