Skip to contentSkip to conversation

app/test: fix make build when ring PMD is disabled

PATCH Superseded Reshma Pattan 7 participants 25 messages Oct 17, 2019 – Feb 16, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 app/test: fix make build when ring PMD is disabled

1)pdump, latency, bitrate 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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
---
 app/test/Makefile  | 16 ++++++----------
 app/test/process.h |  8 ++++++++
 app/test/test.c    |  2 ++
 3 files changed, 16 insertions(+), 10 deletions(-)
app/test/Makefile +6 -10
index df7f77f44..30ecaf8fb 100644
@@ -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,9 @@ 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
+ifeq ($(CONFIG_RTE_LIBRTE_RING_PMD),y)
 SRCS-y += test_event_eth_tx_adapter.c
+endif
 SRCS-y += test_event_timer_adapter.c
 SRCS-y += test_event_crypto_adapter.c
 endif
@@ -260,13 +263,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)
app/test/process.h +8 -0
index 128ce4121..69c358e02 100644
@@ -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;
 }
app/test/test.c +2 -0
index cd7aaf645..d0826ca69 100644
@@ -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 },
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 app/test: fix meson build when ring PMD is disabled

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
---
 app/test/meson.build | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)
app/test/meson.build +19 -14
index 2c23c6347..43ae98b68 100644
@@ -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
+
 foreach d:test_deps
 	def_lib = get_option('default_library')
 	test_dep_objs += get_variable(def_lib + '_rte_' + d)
Signature · 1 line
2.21.0
#2 lore raw

Re: [dpdk-dev] [PATCH 2/2] app/test: fix meson build when ring PMD is disabled

Quoted 130 lines · Reshma Pattan

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
---
 app/test/meson.build | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)
app/test/meson.build +9 -14
index 2c23c6347..43ae98b68 100644
@@ -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'

app/test/meson.build if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') · line 361

Quoted 10 lines
app/test/meson.build +10 -0
+	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.

Quoted 6 lines
app/test/meson.build +0 -0
 foreach d:test_deps
 	def_lib = get_option('default_library')
 	test_dep_objs += get_variable(def_lib + '_rte_' + d)
Signature · 1 line
2.21.0
#3 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH 2/2] app/test: fix meson build when ring PMD is disabled

In reply to Reshma Pattan
Quoted 10 lines · Reshma Pattan

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")
Quoted 6 lines
CC Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>

Please squash this with the first patch.
Thanks.

Signature · 1 line
David Marchand
#4 lore raw
In reply to Reshma Pattan
Quoted 60 lines · Reshma Pattan

1)pdump, latency, bitrate 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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
---
 app/test/Makefile  | 16 ++++++----------
 app/test/process.h |  8 ++++++++
 app/test/test.c    |  2 ++
 3 files changed, 16 insertions(+), 10 deletions(-)
app/test/Makefile +4 -3
index df7f77f44..30ecaf8fb 100644
@@ -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)

app/test/Makefile ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) · line 214

Quoted 6 lines
app/test/Makefile +2 -0
@@ -208,7 +209,9 @@ 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
+ifeq ($(CONFIG_RTE_LIBRTE_RING_PMD),y)
 SRCS-y += test_event_eth_tx_adapter.c
+endif

Minor nit, the ifeq can be removed by changing the SRCS-y to SRCS-$(CONFIG...)

Quoted 83 lines
app/test/Makefile +0 -7
 SRCS-y += test_event_timer_adapter.c
 SRCS-y += test_event_crypto_adapter.c
 endif
@@ -260,13 +263,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)
app/test/process.h +8 -0
index 128ce4121..69c358e02 100644
@@ -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;
 }
app/test/test.c +2 -0
index cd7aaf645..d0826ca69 100644
@@ -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 },
Signature · 1 line
2.21.0
#5 lore raw

PATCH v2 1/1 app/test: fix build when ring PMD is disabled

In reply to Reshma Pattan

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>

---
v2: fix comments of v1 and combine the patches 1/2 and 2/2 of v1.

---
 app/test/Makefile    | 16 +++++-----------
 app/test/meson.build | 28 ++++++++++++++--------------
 app/test/process.h   |  8 ++++++++
 app/test/test.c      |  2 ++
 4 files changed, 29 insertions(+), 25 deletions(-)
app/test/Makefile +5 -11
index df7f77f44..afbdb3854 100644
@@ -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
@@ -260,13 +261,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)
app/test/meson.build +14 -14
index 2c23c6347..e221e44f7 100644
@@ -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,20 @@ 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 += 'bitratestats_autotest'
+	fast_test_names += 'latencystats_autotest'
+	fast_test_names += 'link_bonding_mode4_autotest'
+	fast_test_names += 'pdump_autotest'
 endif
 
 if dpdk_conf.has('RTE_LIBRTE_POWER')
app/test/process.h +8 -0
index 128ce4121..69c358e02 100644
@@ -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;
 }
app/test/test.c +2 -0
index cd7aaf645..d0826ca69 100644
@@ -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 },
Signature · 1 line
2.21.0
Acked-by on v2 1/1
#6 lore raw

Re: [dpdk-dev] [PATCH v2] app/test: fix build when ring PMD is disabled

Quoted 13 lines · Reshma Pattan

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")
Quoted 8 lines
CC Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
#7 lore raw

Re: [dpdk-dev] [PATCH v2] app/test: fix build when ring PMD is disabled

In reply to Reshma Pattan
Quoted 4 lines · Reshma Pattan
app/test/meson.build +0 -0
index 2c23c6347..e221e44f7 100644

[snip]

app/test/meson.build driver_test_names = [ · line 285

Quoted 5 lines
app/test/meson.build +0 -1
@@ -282,7 +269,6 @@ driver_test_names = [
         'eventdev_selftest_octeontx',
         'eventdev_selftest_sw',
         'link_bonding_autotest',
-        'link_bonding_mode4_autotest',

This test was in the driver list.

app/test/meson.build if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') · line 305

Quoted 5 lines
app/test/meson.build +0 -0
         'link_bonding_rssconf_autotest',
         'rawdev_autotest',
 ]
@@ -319,6 +305,20 @@ if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
 endif

Interlacing the test names, then inspecting the .c files, I noticed that the event_eth_tx test is missing:

app/test/meson.build if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')

Quoted 10 lines
app/test/meson.build +5 -0
 if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
        test_deps += 'pmd_ring'
+       test_sources += 'test_pmd_ring_perf.c'
+       perf_test_names += 'ring_pmd_perf_autotest'
 
 
+       test_sources += 'test_pmd_ring.c'
+       fast_test_names += 'ring_pmd_autotest'
 
+       test_sources += 'test_event_eth_tx_adapter.c'

No associated test.

app/test/meson.build if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')

Quoted 8 lines
app/test/meson.build +6 -0
+       test_sources += 'sample_packet_forward.c'
+       test_sources += 'test_bitratestats.c'
+       fast_test_names += 'bitratestats_autotest'
 
+       test_sources += 'test_latencystats.c'
+       fast_test_names += 'latencystats_autotest'
 
+       test_sources += 'test_link_bonding_mode4.c'

Wrong list name, as I mentioned earlier.

Quoted 4 lines
app/test/meson.build +3 -0
+       fast_test_names += 'link_bonding_mode4_autotest'
 
+       test_sources += 'test_pdump.c'
+       fast_test_names += 'pdump_autotest'
Signature · 1 line
David Marchand
#8 lore raw

Re: [dpdk-dev] [PATCH v2] app/test: fix build when ring PMD is disabled

Quoted 4 lines

-----Original Message-----
From: David Marchand <[email protected]>

<snip>

Quoted 9 lines
Quoted 4 lines · Reshma Pattan
app/test/meson.build index renamed from app/test/meson.build +0 -0

2c23c6347..e221e44f7 100644

app/test/meson.build +0 -0

[snip]

Quoted 7 lines

app/test/meson.build driver_test_names = [ · line 285

Quoted 5 lines
app/test/meson.build +0 -1
@@ -282,7 +269,6 @@ driver_test_names = [
         'eventdev_selftest_octeontx',
         'eventdev_selftest_sw',
         'link_bonding_autotest',
-        'link_bonding_mode4_autotest',

This test was in the driver list.

<snip>

Addressed in v3.

Thanks,
Reshma

#9 lore raw

PATCH v3 1/1 app/test: fix build when ring PMD is disabled

In reply to Reshma Pattan

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>

---
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(-)
app/test/Makefile +5 -11
index e2832fb5b..e5168ff9c 100644
@@ -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)
app/test/meson.build +15 -14
index d066e49af..338a0b5fd 100644
@@ -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')
app/test/process.h +8 -0
index 128ce4121..69c358e02 100644
@@ -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;
 }
app/test/test.c +2 -0
index cd7aaf645..d0826ca69 100644
@@ -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 },
Signature · 1 line
2.21.0
#10 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 20 lines · Reshma Pattan

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
Quoted 4 lines

---
v3: add missing test event_eth_tx_adapter_autotest.

https://travis-ci.com/ovsrobot/dpdk/jobs/249598391

79/83 DPDK:fast-tests / event_eth_tx_adapter_autotest FAIL 0.12 s
(exit status 255 or signal 127 SIGinvalid)
--- command --- DPDK_TEST='event_eth_tx_adapter_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file-prefix=event_eth_tx_adapter_autotest
--- stdout ---
EAL: Probing VFIO support...
APP: HPET is not enabled, using TSC as default timer RTE>>event_eth_tx_adapter_autotest
+ ------------------------------------------------------- +
+ Test Suite : tx event eth adapter test suite
Port 0 MAC: 00 00 00 00 00 00
Port 1 MAC: 00 00 00 00 00 00
Failed to find a valid event device, testing with event_sw0 device
+ ------------------------------------------------------- +
+ Test Suite Summary

 + Tests Total :        5
 + Tests Skipped :      0
 + Tests Executed :     0
 + Tests Unsupported:   0
 + Tests Passed :       0
 + Tests Failed :       5

+ ------------------------------------------------------- +
Test Failed

Signature · 1 line
David Marchand
#11 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 57 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Sunday, October 27, 2019 8:48 AM
To: Pattan, Reshma <[email protected]>
Cc: dev <[email protected]>; dpdk stable <[email protected]>; Rao, Nikhil <[email protected]>; Chas Williams <[email protected]>; Richardson, Bruce <[email protected]>; Stephen Hemminger <[email protected]>
Subject: Re: [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 21 lines · Reshma Pattan

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
Quoted 4 lines

---
v3: add missing test event_eth_tx_adapter_autotest.

https://travis-ci.com/ovsrobot/dpdk/jobs/249598391

79/83 DPDK:fast-tests / event_eth_tx_adapter_autotest FAIL 0.12 s
(exit status 255 or signal 127 SIGinvalid)
--- command ---
DPDK_TEST='event_eth_tx_adapter_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file- prefix=event_eth_tx_adapter_autotest
--- stdout ---
EAL: Probing VFIO support...
APP: HPET is not enabled, using TSC as default timer RTE>>event_eth_tx_adapter_autotest
+ ------------------------------------------------------- + + Test Suite : tx event eth
adapter test suite Port 0 MAC: 00 00 00 00 00 00 Port 1 MAC: 00 00 00 00 00 00 Failed to find a valid event device, testing with event_sw0 device + ---------------- --------------------------------------- + + Test Suite Summary

Quoted 8 lines
 + Tests Total :        5
 + Tests Skipped :      0
 + Tests Executed :     0
 + Tests Unsupported:   0
 + Tests Passed :       0
 + Tests Failed :       5

+ ------------------------------------------------------- + Test Failed

Is this something that Nikhil should look into this as maintainer and fix in separate patch, I am afraid this is not my area of expertise.

Thanks,
Reshma

#12 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 67 lines · Reshma
Quoted 58 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Sunday, October 27, 2019 8:48 AM
To: Pattan, Reshma <[email protected]>
Cc: dev <[email protected]>; dpdk stable <[email protected]>; Rao, Nikhil <[email protected]>; Chas Williams <[email protected]>; Richardson, Bruce <[email protected]>; Stephen Hemminger <[email protected]>
Subject: Re: [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 21 lines · Reshma Pattan

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
Quoted 4 lines

---
v3: add missing test event_eth_tx_adapter_autotest.

https://travis-ci.com/ovsrobot/dpdk/jobs/249598391

79/83 DPDK:fast-tests / event_eth_tx_adapter_autotest FAIL 0.12 s
(exit status 255 or signal 127 SIGinvalid)
--- command ---
DPDK_TEST='event_eth_tx_adapter_autotest' /home/travis/build/ovsrobot/dpdk/build/app/test/dpdk-test -l 0-1 --file- prefix=event_eth_tx_adapter_autotest
--- stdout ---
EAL: Probing VFIO support...
APP: HPET is not enabled, using TSC as default timer RTE>>event_eth_tx_adapter_autotest
+ ------------------------------------------------------- + + Test Suite : tx event eth
adapter test suite Port 0 MAC: 00 00 00 00 00 00 Port 1 MAC: 00 00 00 00 00 00 Failed to find a valid event device, testing with event_sw0 device + ---------------- --------------------------------------- + + Test Suite Summary

Quoted 8 lines
 + Tests Total :        5
 + Tests Skipped :      0
 + Tests Executed :     0
 + Tests Unsupported:   0
 + Tests Passed :       0
 + Tests Failed :       5

+ ------------------------------------------------------- + Test Failed

Quoted 1 line

Is this something that Nikhil should look into this as maintainer and fix in separate patch, I am afraid this is not my area of expertise.

I agree that someone knowing of this test should be looking at it.

My suggestion on adding this test was based on the fact that we were building this code test.
But I was expecting that you test this addition.

You shall not break the CI :-)
Please add this to your checklist for future submissions, or at least check the robot reports.

Thanks.

Signature · 1 line
David Marchand
#13 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 19 lines

-----Original Message-----
From: David Marchand <[email protected]>
Sent: Thursday, October 31, 2019 7:58 AM
To: Pattan, Reshma <[email protected]>
Cc: Rao, Nikhil <[email protected]>; dev <[email protected]>; dpdk stable <[email protected]>; Chas Williams <[email protected]>; Richardson, Bruce <[email protected]>; Stephen Hemminger <[email protected]>
Subject: Re: [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 4 lines · Reshma
Quoted 4 lines

-----Original Message-----

<snip>

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Failed

Is this something that Nikhil should look into this as maintainer and fix in

separate patch, I am afraid this is not my area of expertise.

I agree that someone knowing of this test should be looking at it.

Quoted 9 lines

My suggestion on adding this test was based on the fact that we were building this code test.
But I was expecting that you test this addition.

You shall not break the CI :-)
Please add this to your checklist for future submissions, or at least check the robot reports.

My mistake, I missed to check the travis report https://travis-ci.com/ovsrobot/dpdk/builds/133589702
I will note this point to check the reports and run the test.

Thanks,
Reshma

#14 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

In reply to David Marchand
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

-----Original Message-----
From: David Marchand <[email protected]>

Quoted 1 line

v3: add missing test event_eth_tx_adapter_autotest.

Just wondering, if is it ok to send me the v4 by reverting the test case addition from run for this patch to get accepted, as fixing the test case can be handled separately.

Quoted 18 lines
Quoted 1 line

Is this something that Nikhil should look into this as maintainer and fix in

separate patch, I am afraid this is not my area of expertise.

I agree that someone knowing of this test should be looking at it.

My suggestion on adding this test was based on the fact that we were building this code test.
But I was expecting that you test this addition.

You shall not break the CI :-)
Please add this to your checklist for future submissions, or at least check the robot reports.

Thanks.

--
David Marchand

#15 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 7 lines · Reshma
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

-----Original Message-----
From: David Marchand <[email protected]>

Quoted 1 line

v3: add missing test event_eth_tx_adapter_autotest.

Just wondering, if is it ok to send me the v4 by reverting the test case addition from run for this patch to get accepted, as fixing the test case can be handled separately.

Is the root cause of the failures missing '-d' parameter, why not provide that instead of not executing the test cases?

David, Aaron, Can it be possible to test providing '-d' paramter in travis and see if it fixes the issue?

And what do you think splitting the patch into two, one fixes the build issues and other adding the missing testcases to the test suit?

Quoted 20 lines
Quoted 19 lines
Quoted 2 lines

Is this something that Nikhil should look into this as maintainer and fix in

separate patch, I am afraid this is not my area of expertise.

I agree that someone knowing of this test should be looking at it.

My suggestion on adding this test was based on the fact that we were building this code test.
But I was expecting that you test this addition.

You shall not break the CI :-)
Please add this to your checklist for future submissions, or at least check the robot reports.

Thanks.

--
David Marchand

#16 lore raw

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/test: fix build when ring PMD is disabled

Quoted 5 lines · Ferruh Yigit
Quoted 4 lines · Reshma
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

-----Original Message-----
From: David Marchand <[email protected]>

Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

v3: add missing test event_eth_tx_adapter_autotest.

Just wondering, if is it ok to send me the v4 by reverting the test case addition from run for this patch to get accepted, as fixing the test case can be handled separately.

Is the root cause of the failures missing '-d' parameter, why not provide that instead of not executing the test cases?

+1

Quoted 2 lines

David, Aaron, Can it be possible to test providing '-d' paramter in travis and see if it fixes the issue?

It's always possible. The best way would be to use one's own github repo and travis-ci instance to test the changes and ensure they are correct. It's also possible to submit a patch to the list that has the change and it will be applied and a build + test should happen.

Quoted 15 lines

And what do you think splitting the patch into two, one fixes the build issues and other adding the missing testcases to the test suit?

Quoted 11 lines
Quoted 11 lines
Quoted 2 lines

Is this something that Nikhil should look into this as maintainer and fix in

separate patch, I am afraid this is not my area of expertise.

I agree that someone knowing of this test should be looking at it.

My suggestion on adding this test was based on the fact that we were building this code test.
But I was expecting that you test this addition.

You shall not break the CI :-)

+1000 to this

Quoted 9 lines
Quoted 9 lines
Quoted 8 lines

Please add this to your checklist for future submissions, or at least check the robot reports.

Thanks.

--
David Marchand

#17 lore raw

PATCH v4 1/1 app/test: fix build when ring PMD is disabled

In reply to Reshma Pattan

Some unit tests has dependency on RING PMD,
so this patch is trying to fix those and other
closely related issues.

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.

3)Tx adapter UT is dependent on RING PMD, but it was observed that it was missing from the run in meson build, so added it. TX adapter UT uses 'sw event and 'null' pmd drivers, so for shared builds the drivers .so path has to be passed to the test args of meson UT run.

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>

---
v4: fix event_eth_tx_adapter_autotest for shared build as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
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 | 37 +++++++++++++++++++++++--------------
 app/test/process.h   |  8 ++++++++
 app/test/test.c      |  2 ++
 4 files changed, 38 insertions(+), 25 deletions(-)
app/test/Makefile +5 -11
index 57930c00b..1ee155009 100644
@@ -151,8 +151,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
@@ -181,11 +185,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)
@@ -215,7 +216,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
@@ -268,13 +269,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)
app/test/meson.build +23 -14
index fb49d804b..b3790b4bc 100644
@@ -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',
@@ -65,9 +62,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',
@@ -88,11 +83,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',
@@ -212,7 +204,6 @@ fast_test_names = [
         'rib_autotest',
         'rib6_autotest',
         'ring_autotest',
-        'ring_pmd_autotest',
         'rwlock_test1_autotest',
         'rwlock_rda_autotest',
         'rwlock_rds_wrm_autotest',
@@ -227,7 +218,6 @@ fast_test_names = [
         'timer_autotest',
         'user_delay_us',
         'version_autotest',
-        'bitratestats_autotest',
         'crc_autotest',
         'delay_us_sleep_autotest',
         'distributor_autotest',
@@ -238,10 +228,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',
@@ -277,7 +265,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',
@@ -302,7 +289,6 @@ driver_test_names = [
         'eventdev_selftest_octeontx',
         'eventdev_selftest_sw',
         'link_bonding_autotest',
-        'link_bonding_mode4_autotest',
         'link_bonding_rssconf_autotest',
         'rawdev_autotest',
 ]
@@ -339,6 +325,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')
@@ -414,7 +415,15 @@ endif
 num_cores_arg = '-l ' + num_cores
 
 test_args = [num_cores_arg]
+
+
 foreach arg : fast_test_names
+	if (get_option('default_library') == 'shared' and
+		arg == 'event_eth_tx_adapter_autotest')
+		foreach drv:dpdk_drivers
+			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
+		endforeach
+	endif
 	if host_machine.system() == 'linux'
 		test(arg, dpdk_test,
 			  env : ['DPDK_TEST=' + arg],
app/test/process.h +8 -0
index 191d2796a..c3b378033 100644
@@ -25,10 +25,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,
@@ -44,7 +46,9 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 	int i, status;
 	char path[32];
 #ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIBRTE_RING_PMD
 	pthread_t thread;
+#endif
 #endif
 
 	pid_t pid = fork();
@@ -121,17 +125,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;
 }
app/test/test.c +2 -0
index cd7aaf645..d0826ca69 100644
@@ -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 },
Signature · 1 line
2.21.0
#18 lore raw

Re: [dpdk-dev] [PATCH v4] app/test: fix build when ring PMD is disabled

Quoted 45 lines · Reshma Pattan

Some unit tests has dependency on RING PMD,
so this patch is trying to fix those and other
closely related issues.

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.

3)Tx adapter UT is dependent on RING PMD, but it was observed that it was missing from the run in meson build, so added it. TX adapter UT uses 'sw event and 'null' pmd drivers, so for shared builds the drivers .so path has to be passed to the test args of meson UT run.

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>

---
v4: fix event_eth_tx_adapter_autotest for shared build as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
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 | 37 +++++++++++++++++++++++--------------
 app/test/process.h   |  8 ++++++++
 app/test/test.c      |  2 ++
 4 files changed, 38 insertions(+), 25 deletions(-)

<snip>

app/test/meson.build endif · line 419

Quoted 4 lines

test_args = [num_cores_arg]

app/test/meson.build +2 -0
+
+

One blank line is probably enough.

app/test/meson.build endif · line 426

Quoted 7 lines

foreach arg : fast_test_names

app/test/meson.build +6 -0
+	if (get_option('default_library') == 'shared' and
+		arg == 'event_eth_tx_adapter_autotest')
+		foreach drv:dpdk_drivers
+			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
+		endforeach
+	endif

Does this need to be limited to just this one test? Why not just set the test args outside the loop to always include all drivers if it is a shared build?

/Bruce

#19 lore raw

Re: [dpdk-dev] [PATCH v4] app/test: fix build when ring PMD is disabled

Quoted 4 lines

-----Original Message-----
From: Bruce Richardson <[email protected]>

<snip>

Quoted 12 lines

app/test/meson.build endif · line 426

Quoted 8 lines

foreach arg : fast_test_names

app/test/meson.build +6 -0
+	if (get_option('default_library') == 'shared' and
+		arg == 'event_eth_tx_adapter_autotest')
+		foreach drv:dpdk_drivers
+			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
+		endforeach
+	endif

Does this need to be limited to just this one test? Why not just set the test args outside the loop to always include all drivers if it is a shared build?

I was seeing couple of other UTs failing when I set the testargs commonly for all tests. I am not sure about why, so enabling only for that particular UT which actually needed them.

APP: HPET is not enabled, using TSC as default timer RTE>>alarm_autotest^M
check if the callback will be called Callback not called
Test Failed
RTE>>

RTE>>interrupt_autotest^M
Check unknown valid interrupt full path
callback has not been called
failure occurred during checking unknown valid interrupt full path Clearing for interrupt tests
Test Failed
RTE>>

Thanks,
Reshma

#20 lore raw

PATCH v5 1/1 app/test: fix build when ring PMD is disabled

In reply to Reshma Pattan

Some unit tests has dependency on RING PMD,
so this patch is trying to fix those and other
closely related issues.

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.

3)Tx adapter UT is dependent on RING PMD, but it was observed that it was missing from the run in meson build, so added it. TX adapter UT uses 'sw event and 'null' pmd drivers, so for shared builds the drivers .so path has to be passed to the test args of meson UT run.

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>

---
v5: remove extra blank line.
v4: fix event_eth_tx_adapter_autotest for shared build as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
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 | 36 ++++++++++++++++++++++--------------
 app/test/process.h   |  8 ++++++++
 app/test/test.c      |  2 ++
 4 files changed, 37 insertions(+), 25 deletions(-)
app/test/Makefile +5 -11
index 57930c00b..1ee155009 100644
@@ -151,8 +151,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
@@ -181,11 +185,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)
@@ -215,7 +216,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
@@ -268,13 +269,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)
app/test/meson.build +22 -14
index fb49d804b..e38d97d51 100644
@@ -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',
@@ -65,9 +62,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',
@@ -88,11 +83,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',
@@ -212,7 +204,6 @@ fast_test_names = [
         'rib_autotest',
         'rib6_autotest',
         'ring_autotest',
-        'ring_pmd_autotest',
         'rwlock_test1_autotest',
         'rwlock_rda_autotest',
         'rwlock_rds_wrm_autotest',
@@ -227,7 +218,6 @@ fast_test_names = [
         'timer_autotest',
         'user_delay_us',
         'version_autotest',
-        'bitratestats_autotest',
         'crc_autotest',
         'delay_us_sleep_autotest',
         'distributor_autotest',
@@ -238,10 +228,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',
@@ -277,7 +265,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',
@@ -302,7 +289,6 @@ driver_test_names = [
         'eventdev_selftest_octeontx',
         'eventdev_selftest_sw',
         'link_bonding_autotest',
-        'link_bonding_mode4_autotest',
         'link_bonding_rssconf_autotest',
         'rawdev_autotest',
 ]
@@ -339,6 +325,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')
@@ -414,7 +415,14 @@ endif
 num_cores_arg = '-l ' + num_cores
 
 test_args = [num_cores_arg]
+
 foreach arg : fast_test_names
+	if (get_option('default_library') == 'shared' and
+		arg == 'event_eth_tx_adapter_autotest')
+		foreach drv:dpdk_drivers
+			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
+		endforeach
+	endif
 	if host_machine.system() == 'linux'
 		test(arg, dpdk_test,
 			  env : ['DPDK_TEST=' + arg],
app/test/process.h +8 -0
index 191d2796a..c3b378033 100644
@@ -25,10 +25,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,
@@ -44,7 +46,9 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 	int i, status;
 	char path[32];
 #ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIBRTE_RING_PMD
 	pthread_t thread;
+#endif
 #endif
 
 	pid_t pid = fork();
@@ -121,17 +125,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;
 }
app/test/test.c +2 -0
index cd7aaf645..d0826ca69 100644
@@ -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 },
Signature · 1 line
2.21.0
#21 lore raw

Re: [dpdk-dev] [PATCH v5] app/test: fix build when ring PMD is disabled

Someone to review please?

23/12/2019 07:53, Reshma Pattan:

Quoted 45 lines

Some unit tests has dependency on RING PMD,
so this patch is trying to fix those and other
closely related issues.

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.

3)Tx adapter UT is dependent on RING PMD, but it was observed that it was missing from the run in meson build, so added it. TX adapter UT uses 'sw event and 'null' pmd drivers, so for shared builds the drivers .so path has to be passed to the test args of meson UT run.

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>

---
v5: remove extra blank line.
v4: fix event_eth_tx_adapter_autotest for shared build as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
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 | 36 ++++++++++++++++++++++--------------
 app/test/process.h   |  8 ++++++++
 app/test/test.c      |  2 ++
 4 files changed, 37 insertions(+), 25 deletions(-)
Tested-by
#22 lore raw

Re: [dpdk-dev] [PATCH v5] app/test: fix build when ring PMD is disabled

Quoted 13 lines

-----Original Message-----
From: Thomas Monjalon <[email protected]>
Sent: Monday, January 20, 2020 3:20 AM
To: [email protected]
Cc: [email protected]; Rao, Nikhil <[email protected]>; Chas Williams <[email protected]>; Richardson, Bruce <[email protected]>; Stephen Hemminger <[email protected]>; Pattan, Reshma <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v5] app/test: fix build when ring PMD is disabled

Quoted 50 lines

Someone to review please?

23/12/2019 07:53, Reshma Pattan:

Quoted 44 lines

Some unit tests has dependency on RING PMD, so this patch is trying to fix those and other closely related issues.

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.

3)Tx adapter UT is dependent on RING PMD, but it was observed that it was missing from the run in meson build, so added it. TX adapter UT uses 'sw event and 'null' pmd drivers, so for shared builds the drivers .so path has to be passed to the test args of meson UT run.

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>

---
v5: remove extra blank line.
v4: fix event_eth_tx_adapter_autotest for shared build as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
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 | 36 ++++++++++++++++++++++--------------
 app/test/process.h   |  8 ++++++++
 app/test/test.c      |  2 ++
 4 files changed, 37 insertions(+), 25 deletions(-)

For the fixes related to event_eth_tx_adapter_autotest

Tested-by on v5 1/1
#23 lore raw

Re: [dpdk-dev] [PATCH v5] app/test: fix build when ring PMD is disabled

In reply to Reshma Pattan
Quoted 31 lines · Reshma Pattan

Some unit tests has dependency on RING PMD,
so this patch is trying to fix those and other
closely related issues.

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.

3)Tx adapter UT is dependent on RING PMD, but it was observed that it was missing from the run in meson build, so added it. TX adapter UT uses 'sw event and 'null' pmd drivers, so for shared builds the drivers .so path has to be passed to the test args of meson UT run.

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
Quoted 9 lines

---
v5: remove extra blank line.
v4: fix event_eth_tx_adapter_autotest for shared build as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
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
---

Confirmed build now works with disable_drivers=net/ring

Unfortunately, other parts fail if other drivers are similarly disabled, but that is for another patchset (and probably release!) to fix.

#24 lore raw

Re: [dpdk-dev] [PATCH v5] app/test: fix build when ring PMD is disabled

20/01/2020 18:36, Bruce Richardson:

Quoted 42 lines · Reshma Pattan
Quoted 31 lines

Some unit tests has dependency on RING PMD,
so this patch is trying to fix those and other
closely related issues.

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.

3)Tx adapter UT is dependent on RING PMD, but it was observed that it was missing from the run in meson build, so added it. TX adapter UT uses 'sw event and 'null' pmd drivers, so for shared builds the drivers .so path has to be passed to the test args of meson UT run.

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 Nikhil Rao <[email protected]>
CC Chas Williams <[email protected]>
CC Bruce Richardson <[email protected]>
CC Stephen Hemminger <[email protected]>
Quoted 9 lines

---
v5: remove extra blank line.
v4: fix event_eth_tx_adapter_autotest for shared build as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
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
---

Quoted 3 lines

Confirmed build now works with disable_drivers=net/ring

Applied, thanks

Quoted 2 lines

Unfortunately, other parts fail if other drivers are similarly disabled, but that is for another patchset (and probably release!) to fix.

Good to know we are far from retirement ;)