Skip to contentSkip to conversation

app/test: allow building with bonding net driver disabled

PATCH Applied Bruce Richardson 3 participants 3 messages May 1, 2020 – May 11, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 app/test: allow building with bonding net driver disabled

The autotest application build was partially enabled for building with the net/bond driver disabled, but a number of items were missed, leading to build errors when the driver was disabled, e.g. by simply doing "-Ddisable_drivers=net/*" when calling meson.

../app/test/test_link_bonding.c:25:10: fatal error: rte_eth_bond.h: \
No such file or directory

With this fix in place, it's possible to build DPDK with meson with all non-bus, non-mempool drivers disabled i.e. using meson option

-Ddisable_drivers=baseband/*,compress/*,crypto/*,event/*,net/*,raw/*,vdpa/*

---
 app/test/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
app/test/meson.build +4 -4
index fc60acbe7..03dd6c3de 100644
@@ -63,8 +63,6 @@ test_sources = files('commands.c',
 	'test_ipsec_sad.c',
 	'test_kni.c',
 	'test_kvargs.c',
-	'test_link_bonding.c',
-	'test_link_bonding_rssconf.c',
 	'test_logs.c',
 	'test_lpm.c',
 	'test_lpm6.c',
@@ -136,6 +134,8 @@ test_sources = files('commands.c',
 )
 
 test_deps = ['acl',
+	'bus_pci',
+	'bus_vdev',
 	'bitratestats',
 	'bpf',
 	'cfgfile',
@@ -306,8 +306,6 @@ driver_test_names = [
         'cryptodev_sw_zuc_autotest',
         'eventdev_selftest_octeontx',
         'eventdev_selftest_sw',
-        'link_bonding_autotest',
-        'link_bonding_rssconf_autotest',
         'rawdev_autotest',
 ]
 
@@ -340,6 +338,8 @@ endif
 # they are used via a driver-specific API.
 if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
 	test_deps += 'pmd_bond'
+	test_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c']
+	driver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest']
 endif
 if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
 	test_deps += 'pmd_ring'
Signature · 1 line
2.20.1
Acked-by Tested-by on v1 1/1
#1 lore raw

W dniu 01.05.2020 o 17:05, Bruce Richardson pisze:

Quoted 50 lines

The autotest application build was partially enabled for building with the net/bond driver disabled, but a number of items were missed, leading to build errors when the driver was disabled, e.g. by simply doing "-Ddisable_drivers=net/*" when calling meson.

../app/test/test_link_bonding.c:25:10: fatal error: rte_eth_bond.h: \
No such file or directory

With this fix in place, it's possible to build DPDK with meson with all non-bus, non-mempool drivers disabled i.e. using meson option

-Ddisable_drivers=baseband/*,compress/*,crypto/*,event/*,net/*,raw/*,vdpa/*

---
  app/test/meson.build | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
app/test/meson.build +2 -4
index fc60acbe7..03dd6c3de 100644
@@ -63,8 +63,6 @@ test_sources = files('commands.c',
  	'test_ipsec_sad.c',
  	'test_kni.c',
  	'test_kvargs.c',
-	'test_link_bonding.c',
-	'test_link_bonding_rssconf.c',
  	'test_logs.c',
  	'test_lpm.c',
  	'test_lpm6.c',
@@ -136,6 +134,8 @@ test_sources = files('commands.c',
  )
 
  test_deps = ['acl',
+	'bus_pci',
+	'bus_vdev',
  	'bitratestats',
  	'bpf',
  	'cfgfile',
@@ -306,8 +306,6 @@ driver_test_names = [
          'cryptodev_sw_zuc_autotest',
          'eventdev_selftest_octeontx',
          'eventdev_selftest_sw',
-        'link_bonding_autotest',
-        'link_bonding_rssconf_autotest',
          'rawdev_autotest',
  ]
 

app/test/meson.build endif · line 345

Quoted 8 lines
app/test/meson.build +2 -0
@@ -340,6 +338,8 @@ endif
  # they are used via a driver-specific API.
  if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
  	test_deps += 'pmd_bond'
+	test_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c']
+	driver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest']
  endif
  if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
  	test_deps += 'pmd_ring'

testing conditions:

* confirmed issue without patch and build flag: -Ddisable_drivers=net/* fails to build
* with patch applied test app still builds without flags
* with patch applied test app builds with -Ddisable_drivers=baseband/*,compress/*,crypto/*,event/*,net/*,raw/*,vdpa/*

Signature · 7 lines
Lukasz Wojciechowski
Principal Software Engineer

Samsung R&D Institute Poland
Samsung Electronics
Office +48 22 377 88 25
[email protected]
#2 lore raw

04/05/2020 21:26, Lukasz Wojciechowski:

Quoted 16 lines

W dniu 01.05.2020 o 17:05, Bruce Richardson pisze:

Quoted 8 lines

The autotest application build was partially enabled for building with the net/bond driver disabled, but a number of items were missed, leading to build errors when the driver was disabled, e.g. by simply doing "-Ddisable_drivers=net/*" when calling meson.

../app/test/test_link_bonding.c:25:10: fatal error: rte_eth_bond.h: \
No such file or directory

Quoted 7 lines

With this fix in place, it's possible to build DPDK with meson with all non-bus, non-mempool drivers disabled i.e. using meson option

-Ddisable_drivers=baseband/*,compress/*,crypto/*,event/*,net/*,raw/*,vdpa/*

---

Quoted 8 lines

* confirmed issue without patch and build flag: -Ddisable_drivers=net/* fails to build
* with patch applied test app still builds without flags
* with patch applied test app builds with -Ddisable_drivers=baseband/*,compress/*,crypto/*,event/*,net/*,raw/*,vdpa/*

Applied, thanks