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 03421A32A4
for <public@inbox.dpdk.org>; Fri, 25 Oct 2019 17:38:16 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id ECC0B1D15E;
Fri, 25 Oct 2019 17:38:15 +0200 (CEST)
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
by dpdk.org (Postfix) with ESMTP id 22D271D15E;
Fri, 25 Oct 2019 17:38:13 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga005.fm.intel.com ([10.253.24.32])
by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
25 Oct 2019 08:38:13 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.68,229,1569308400"; d="scan'208";a="398795254"
Received: from silpixa00400214.ir.intel.com (HELO
silpixa00400214.ger.corp.intel.com) ([10.237.222.119])
by fmsmga005.fm.intel.com with ESMTP; 25 Oct 2019 08:38:11 -0700
From: Reshma Pattan <reshma.pattan@intel.com>
To: dev@dpdk.org
Cc: Reshma Pattan <reshma.pattan@intel.com>, stable@dpdk.org,
Nikhil Rao <nikhil.rao@intel.com>, Chas Williams <chas3@att.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 25 Oct 2019 16:38:08 +0100
Message-Id: <20191025153808.31753-1-reshma.pattan@intel.com>
X-Mailer: git-send-email 2.21.0
In-Reply-To: <20191017111628.5396-1-reshma.pattan@intel.com>
References: <20191017111628.5396-1-reshma.pattan@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] [PATCH v3] app/test: fix 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>
1)pdump, latency, bitrate, ring PMD and test_event_eth_tx_adapter
unit tests are dependent on ring PMD, so compile those
tests only when ring PMD is enabled else ignore.
2)get rid of make file error which was added by bond unit test
for ring PMD disabled case which is not necessary.
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")
Fixes: d23e09e0ef ("app/test: link with ring pmd when needed")
CC: stable@dpdk.org
CC: Nikhil Rao <nikhil.rao@intel.com>
CC: Chas Williams <chas3@att.com>
CC: Bruce Richardson <bruce.richardson@intel.com>
CC: Stephen Hemminger <stephen@networkplumber.org>
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
---
v3: add missing test event_eth_tx_adapter_autotest.
Add link bonding mode4 test to drivers test.
v2: fix comments of v1 and combine the patches 1/2 and 2/2 of v1
---
app/test/Makefile | 16 +++++-----------
app/test/meson.build | 29 +++++++++++++++--------------
app/test/process.h | 8 ++++++++
app/test/test.c | 2 ++
4 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/app/test/Makefile b/app/test/Makefile
index e2832fb5b..e5168ff9c 100644
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -144,8 +144,12 @@ SRCS-y += test_func_reentrancy.c
SRCS-y += test_service_cores.c
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
+SRCS-y += sample_packet_forward.c
SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
+SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
+endif
SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c
SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c
@@ -174,11 +178,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor_perf.c
SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c
-SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
-
SRCS-y += virtual_pmd.c
SRCS-y += packet_burst_generator.c
-SRCS-y += sample_packet_forward.c
SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c
ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
@@ -208,7 +209,7 @@ ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y)
SRCS-y += test_eventdev.c
SRCS-y += test_event_ring.c
SRCS-y += test_event_eth_rx_adapter.c
-SRCS-y += test_event_eth_tx_adapter.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_event_eth_tx_adapter.c
SRCS-y += test_event_timer_adapter.c
SRCS-y += test_event_crypto_adapter.c
endif
@@ -261,13 +262,6 @@ endif
endif
endif
-# Link against shared libraries when needed
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
-ifneq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
-$(error Link bonding tests require CONFIG_RTE_LIBRTE_PMD_RING=y)
-endif
-endif
-
ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
diff --git a/app/test/meson.build b/app/test/meson.build
index d066e49af..338a0b5fd 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',
@@ -61,9 +58,7 @@ test_sources = files('commands.c',
'test_ipsec_sad.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',
@@ -84,11 +79,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',
@@ -200,7 +192,6 @@ fast_test_names = [
'rcu_qsbr_autotest',
'red_autotest',
'ring_autotest',
- 'ring_pmd_autotest',
'rwlock_test1_autotest',
'rwlock_rda_autotest',
'rwlock_rds_wrm_autotest',
@@ -215,7 +206,6 @@ fast_test_names = [
'timer_autotest',
'user_delay_us',
'version_autotest',
- 'bitratestats_autotest',
'crc_autotest',
'delay_us_sleep_autotest',
'distributor_autotest',
@@ -226,10 +216,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',
@@ -259,7 +247,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',
@@ -284,7 +271,6 @@ driver_test_names = [
'eventdev_selftest_octeontx',
'eventdev_selftest_sw',
'link_bonding_autotest',
- 'link_bonding_mode4_autotest',
'link_bonding_rssconf_autotest',
'rawdev_autotest',
]
@@ -321,6 +307,21 @@ 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'
+ 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'
+ test_sources += 'test_pdump.c'
+ fast_test_names += 'ring_pmd_autotest'
+ perf_test_names += 'ring_pmd_perf_autotest'
+ fast_test_names += 'event_eth_tx_adapter_autotest'
+ fast_test_names += 'bitratestats_autotest'
+ fast_test_names += 'latencystats_autotest'
+ driver_test_names += 'link_bonding_mode4_autotest'
+ fast_test_names += 'pdump_autotest'
endif
if dpdk_conf.has('RTE_LIBRTE_POWER')
diff --git a/app/test/process.h b/app/test/process.h
index 128ce4121..69c358e02 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -24,10 +24,12 @@
#endif
#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIBRTE_RING_PMD
#include <pthread.h>
extern void *send_pkts(void *empty);
extern uint16_t flag_for_send_pkts;
#endif
+#endif
/*
* launches a second copy of the test process using the given argv parameters,
@@ -43,7 +45,9 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
int i, fd, status;
char path[32];
#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIBRTE_RING_PMD
pthread_t thread;
+#endif
#endif
pid_t pid = fork();
@@ -83,17 +87,21 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
}
/* parent process does a wait */
#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIBRTE_RING_PMD
if ((strcmp(env_value, "run_pdump_server_tests") == 0))
pthread_create(&thread, NULL, &send_pkts, NULL);
+#endif
#endif
while (wait(&status) != pid)
;
#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIBRTE_RING_PMD
if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
flag_for_send_pkts = 0;
pthread_join(thread, NULL);
}
+#endif
#endif
return status;
}
diff --git a/app/test/test.c b/app/test/test.c
index cd7aaf645..d0826ca69 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -53,7 +53,9 @@ do_recursive_call(void)
} actions[] = {
{ "run_secondary_instances", test_mp_secondary },
#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIBRTE_RING_PMD
{ "run_pdump_server_tests", test_pdump },
+#endif
#endif
{ "test_missing_c_flag", no_action },
{ "test_master_lcore_flag", no_action },
--
2.21.0