From: Bruce Richardson <bruce.richardson@intel.com> To: Reshma Pattan <reshma.pattan@intel.com> Cc: dev@dpdk.org, stable@dpdk.org, Nikhil Rao <nikhil.rao@intel.com>, Chas Williams <chas3@att.com>, Stephen Hemminger <stephen@networkplumber.org> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 2/2] app/test: fix meson build when ring PMD is disabled Date: Thu, 17 Oct 2019 10:51:22 +0100 Message-ID: <20191017095122.GD855@bricha3-MOBL.ger.corp.intel.com> (raw) In-Reply-To: <20191017094124.16725-2-reshma.pattan@intel.com> On Thu, Oct 17, 2019 at 10:41:24AM +0100, Reshma Pattan wrote: > pdump, latency, bitrate, ring PMD and test_event_eth_tx_adapter > unit tests are dependent on ring PMD, so enable those > tests only when ring PMD is enabled else ignore. > > Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library") > Fixes: fdeb30fa71 ("test/bitrate: add unit tests for bitrate library") > Fixes: 1e3676a06e ("test/latency: add unit tests for latencystats library") > Fixes: 46cf97e4bb ("eventdev: add test for eth Tx adapter") > > CC: stable@dpdk.org > CC: Nikhil Rao <nikhil.rao@intel.com> > CC: Chas Williams <chas3@att.com> > > Reported-by: Stephen Hemminger <stephen@networkplumber.org> > Signed-off-by: Reshma Pattan <reshma.pattan@intel.com> > --- > app/test/meson.build | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) > > diff --git a/app/test/meson.build b/app/test/meson.build > index 2c23c6347..43ae98b68 100644 > --- a/app/test/meson.build > +++ b/app/test/meson.build > @@ -7,13 +7,11 @@ endif > > test_sources = files('commands.c', > 'packet_burst_generator.c', > - 'sample_packet_forward.c', > 'test.c', > 'test_acl.c', > 'test_alarm.c', > 'test_atomic.c', > 'test_barrier.c', > - 'test_bitratestats.c', > 'test_bpf.c', > 'test_byteorder.c', > 'test_cmdline.c', > @@ -43,7 +41,6 @@ test_sources = files('commands.c', > 'test_event_crypto_adapter.c', > 'test_event_eth_rx_adapter.c', > 'test_event_ring.c', > - 'test_event_eth_tx_adapter.c', > 'test_event_timer_adapter.c', > 'test_eventdev.c', > 'test_external_mem.c', > @@ -60,9 +57,7 @@ test_sources = files('commands.c', > 'test_ipsec.c', > 'test_kni.c', > 'test_kvargs.c', > - 'test_latencystats.c', > 'test_link_bonding.c', > - 'test_link_bonding_mode4.c', > 'test_link_bonding_rssconf.c', > 'test_logs.c', > 'test_lpm.c', > @@ -83,11 +78,8 @@ test_sources = files('commands.c', > 'test_metrics.c', > 'test_mcslock.c', > 'test_mp_secondary.c', > - 'test_pdump.c', > 'test_per_lcore.c', > 'test_pmd_perf.c', > - 'test_pmd_ring.c', > - 'test_pmd_ring_perf.c', > 'test_power.c', > 'test_power_cpufreq.c', > 'test_power_kvm_vm.c', > @@ -199,7 +191,6 @@ fast_test_names = [ > 'rcu_qsbr_autotest', > 'red_autotest', > 'ring_autotest', > - 'ring_pmd_autotest', > 'rwlock_test1_autotest', > 'rwlock_rda_autotest', > 'rwlock_rds_wrm_autotest', > @@ -214,7 +205,6 @@ fast_test_names = [ > 'timer_autotest', > 'user_delay_us', > 'version_autotest', > - 'bitratestats_autotest', > 'crc_autotest', > 'delay_us_sleep_autotest', > 'distributor_autotest', > @@ -225,10 +215,8 @@ fast_test_names = [ > 'ipsec_autotest', > 'kni_autotest', > 'kvargs_autotest', > - 'latencystats_autotest', > 'member_autotest', > 'metrics_autotest', > - 'pdump_autotest', > 'power_cpufreq_autotest', > 'power_autotest', > 'power_kvm_vm_autotest', > @@ -258,7 +246,6 @@ perf_test_names = [ > 'rcu_qsbr_perf_autotest', > 'red_perf', > 'distributor_perf_autotest', > - 'ring_pmd_perf_autotest', > 'pmd_perf_autotest', > 'stack_perf_autotest', > 'stack_lf_perf_autotest', > @@ -282,7 +269,6 @@ driver_test_names = [ > 'eventdev_selftest_octeontx', > 'eventdev_selftest_sw', > 'link_bonding_autotest', > - 'link_bonding_mode4_autotest', > 'link_bonding_rssconf_autotest', > 'rawdev_autotest', > ] > @@ -319,6 +305,10 @@ if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') > endif > if dpdk_conf.has('RTE_LIBRTE_RING_PMD') > test_deps += 'pmd_ring' > + test_sources += 'test_pmd_ring_perf.c' > + test_sources += 'test_pmd_ring.c' > + fast_test_names += 'ring_pmd_autotest' > + perf_test_names += 'ring_pmd_perf_autotest' > endif > > if dpdk_conf.has('RTE_LIBRTE_POWER') > @@ -354,6 +344,21 @@ if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') > driver_test_names += 'cryptodev_scheduler_autotest' > endif > > +if dpdk_conf.has('RTE_LIBRTE_RING_PMD') > + test_sources += 'test_event_eth_tx_adapter.c' > + test_sources += 'test_bitratestats.c' > + test_sources += 'test_latencystats.c' > + test_sources += 'test_link_bonding_mode4.c' > + test_sources += 'sample_packet_forward.c' > + fast_test_names += 'bitratestats_autotest' > + fast_test_names += 'latencystats_autotest' > + fast_test_names += 'link_bonding_mode4_autotest' > +if dpdk_conf.has('RTE_LIBRTE_PDUMP') > + test_sources += 'test_pdump.c' > + fast_test_names += 'pdump_autotest' > +endif > +endif > + Why have two blocks for the same condition "dpdk_conf.has('...RING_PMD')"? Can they not be merged? Also, meson build does not allow disabling of particular libraries, so the check for pdump enabling can be removed, I think. It's always built. > foreach d:test_deps > def_lib = get_option('default_library') > test_dep_objs += get_variable(def_lib + '_rte_' + d) > -- > 2.21.0 >
next prev parent reply other threads:[~2019-10-17 9:51 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-17 9:41 [dpdk-stable] [PATCH 1/2] app/test: fix make " Reshma Pattan 2019-10-17 9:41 ` [dpdk-stable] [PATCH 2/2] app/test: fix meson " Reshma Pattan 2019-10-17 9:51 ` Bruce Richardson [this message] 2019-10-17 9:54 ` David Marchand 2019-10-17 9:48 ` [dpdk-stable] [PATCH 1/2] app/test: fix make " Bruce Richardson 2019-10-17 11:16 ` [dpdk-stable] [PATCH v2] app/test: fix " Reshma Pattan 2019-10-17 13:46 ` Bruce Richardson 2019-10-25 8:11 ` [dpdk-stable] [dpdk-dev] " David Marchand 2019-10-25 15:40 ` Pattan, Reshma 2019-10-25 15:38 ` [dpdk-stable] [PATCH v3] " Reshma Pattan 2019-10-27 8:47 ` David Marchand 2019-10-29 9:36 ` Pattan, Reshma 2019-10-31 7:58 ` David Marchand 2019-10-31 10:18 ` Pattan, Reshma 2019-12-09 13:38 ` Pattan, Reshma 2019-12-09 16:54 ` Ferruh Yigit 2019-12-09 18:00 ` Aaron Conole 2019-12-18 11:58 ` [dpdk-stable] [PATCH v4] " Reshma Pattan 2019-12-18 16:07 ` Bruce Richardson 2019-12-18 16:23 ` Pattan, Reshma 2019-12-23 6:53 ` [dpdk-stable] [PATCH v5] " Reshma Pattan 2020-01-19 21:50 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon 2020-01-20 9:55 ` Rao, Nikhil 2020-01-20 17:36 ` [dpdk-stable] " Bruce Richardson 2020-02-16 18:10 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
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=20191017095122.GD855@bricha3-MOBL.ger.corp.intel.com \ --to=bruce.richardson@intel.com \ --cc=chas3@att.com \ --cc=dev@dpdk.org \ --cc=nikhil.rao@intel.com \ --cc=reshma.pattan@intel.com \ --cc=stable@dpdk.org \ --cc=stephen@networkplumber.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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git