From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH 2/6] app/test: link unit test binary against all available libs
Date: Thu, 13 Jan 2022 17:39:14 +0000 [thread overview]
Message-ID: <20220113173918.2700651-3-bruce.richardson@intel.com> (raw)
In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com>
Rather than maintaining a list of the libraries the unit tests need, and
having to conditionally include/omit optional libs from the list, we can
just link against all available libraries, simplifying the code
considerably.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test/meson.build | 47 +-------------------------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build
index 344a609a4d..9919de4307 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -157,39 +157,7 @@ test_sources = files(
'virtual_pmd.c',
)
-test_deps = [
- 'acl',
- 'bus_pci',
- 'bus_vdev',
- 'bpf',
- 'cfgfile',
- 'cmdline',
- 'cryptodev',
- 'distributor',
- 'dmadev',
- 'efd',
- 'ethdev',
- 'eventdev',
- 'fib',
- 'flow_classify',
- 'graph',
- 'hash',
- 'ipsec',
- 'lpm',
- 'member',
- 'node',
- 'pipeline',
- 'port',
- 'rawdev',
- 'rcu',
- 'reorder',
- 'rib',
- 'ring',
- 'security',
- 'stack',
- 'telemetry',
- 'timer',
-]
+test_deps = enabled_libs
# Each test is marked with flag true/false
# to indicate whether it can run in no-huge mode.
@@ -380,7 +348,6 @@ if dpdk_conf.has('RTE_EVENT_SKELETON')
test_deps += 'event_skeleton'
endif
if dpdk_conf.has('RTE_LIB_METRICS')
- test_deps += 'metrics'
test_sources += ['test_metrics.c']
fast_tests += [['metrics_autotest', true]]
endif
@@ -410,17 +377,14 @@ if dpdk_conf.has('RTE_NET_RING')
perf_test_names += 'ring_pmd_perf_autotest'
fast_tests += [['event_eth_tx_adapter_autotest', false]]
if dpdk_conf.has('RTE_LIB_BITRATESTATS')
- test_deps += 'bitratestats'
test_sources += 'test_bitratestats.c'
fast_tests += [['bitratestats_autotest', true]]
endif
if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
- test_deps += 'latencystats'
test_sources += 'test_latencystats.c'
fast_tests += [['latencystats_autotest', true]]
endif
if dpdk_conf.has('RTE_LIB_PDUMP')
- test_deps += 'pdump'
test_sources += 'test_pdump.c'
fast_tests += [['pdump_autotest', true]]
endif
@@ -434,18 +398,10 @@ endif
if dpdk_conf.has('RTE_HAS_LIBPCAP')
ext_deps += pcap_dep
if dpdk_conf.has('RTE_LIB_PCAPNG')
- test_deps += 'pcapng'
test_sources += 'test_pcapng.c'
endif
endif
-if dpdk_conf.has('RTE_LIB_POWER')
- test_deps += 'power'
-endif
-if dpdk_conf.has('RTE_LIB_KNI')
- test_deps += 'kni'
-endif
-
if cc.has_argument('-Wno-format-truncation')
cflags += '-Wno-format-truncation'
endif
@@ -462,7 +418,6 @@ if dpdk_conf.has('RTE_LIB_COMPRESSDEV')
if compress_test_dep.found()
test_dep_objs += compress_test_dep
test_sources += 'test_compressdev.c'
- test_deps += 'compressdev'
fast_tests += [['compressdev_autotest', false]]
endif
endif
--
2.32.0
next prev 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 ` Bruce Richardson [this message]
2022-01-19 16:51 ` [PATCH 2/6] app/test: link unit test binary against all available libs 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 ` [PATCH 5/6] build: add "packet framework" libs " Bruce Richardson
2022-01-13 17:39 ` [PATCH 6/6] build: add cfgfile library " 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-3-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).