From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 152DCA3168
for <public@inbox.dpdk.org>; Thu, 17 Oct 2019 11:51:32 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D03681E92E;
Thu, 17 Oct 2019 11:51:31 +0200 (CEST)
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
by dpdk.org (Postfix) with ESMTP id A960E1C01B;
Thu, 17 Oct 2019 11:51:27 +0200 (CEST)
X-Amp-Result: UNKNOWN
X-Amp-Original-Verdict: FILE UNKNOWN
X-Amp-File-Uploaded: False
Received: from fmsmga008.fm.intel.com ([10.253.24.58])
by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
17 Oct 2019 02:51:26 -0700
X-IronPort-AV: E=Sophos;i="5.67,307,1566889200"; d="scan'208";a="195112261"
Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.95])
by fmsmga008-auth.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-SHA;
17 Oct 2019 02:51:25 -0700
Date: Thu, 17 Oct 2019 10:51:22 +0100
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>
Message-ID: <20191017095122.GD855@bricha3-MOBL.ger.corp.intel.com>
References: <20191017094124.16725-1-reshma.pattan@intel.com>
<20191017094124.16725-2-reshma.pattan@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20191017094124.16725-2-reshma.pattan@intel.com>
User-Agent: Mutt/1.12.1 (2019-06-15)
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 2/2] app/test: fix meson build
when ring PMD is disabled
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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
>