X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Fmeson.build;h=561e493a2944dacc684136fae67479462b2d7480;hb=d3376cdc7d7d685aee9e84186f8ae315c03f57f3;hp=c5ce1d2c08adc65c1298e33b9abc4f9768bbb3fc;hpb=a20b2c01a7a159609fb732e3ec51b91440a1bf62;p=dpdk.git

diff --git a/app/test/meson.build b/app/test/meson.build
index c5ce1d2c08..561e493a29 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -13,6 +13,7 @@ test_sources = files('commands.c',
 	'test_atomic.c',
 	'test_barrier.c',
 	'test_bitops.c',
+	'test_bitmap.c',
 	'test_bpf.c',
 	'test_byteorder.c',
 	'test_cmdline.c',
@@ -108,9 +109,11 @@ test_sources = files('commands.c',
 	'test_ring_mpmc_stress.c',
 	'test_ring_hts_stress.c',
 	'test_ring_mt_peek_stress.c',
+	'test_ring_mt_peek_stress_zc.c',
 	'test_ring_perf.c',
 	'test_ring_rts_stress.c',
 	'test_ring_st_peek_stress.c',
+	'test_ring_st_peek_stress_zc.c',
 	'test_ring_stress.c',
 	'test_rwlock.c',
 	'test_sched.c',
@@ -189,11 +192,11 @@ fast_tests = [
         ['cycles_autotest', true],
         ['debug_autotest', true],
         ['eal_flags_c_opt_autotest', false],
-        ['eal_flags_master_opt_autotest', false],
+        ['eal_flags_main_opt_autotest', false],
         ['eal_flags_n_opt_autotest', false],
         ['eal_flags_hpet_autotest', false],
         ['eal_flags_no_huge_autotest', false],
-        ['eal_flags_w_opt_autotest', false],
+        ['eal_flags_a_opt_autotest', false],
         ['eal_flags_b_opt_autotest', false],
         ['eal_flags_vdev_opt_autotest', false],
         ['eal_flags_r_opt_autotest', false],
@@ -243,6 +246,7 @@ fast_tests = [
         ['string_autotest', true],
         ['table_autotest', true],
         ['tailq_autotest', true],
+        ['ticketlock_autotest', true],
         ['timer_autotest', false],
         ['user_delay_us', true],
         ['version_autotest', true],
@@ -338,32 +342,32 @@ dump_test_names = [
 # unit tests without requiring that the developer install the
 # DPDK libraries.  Explicit linkage of drivers (plugin libraries)
 # in applications should not be used.
-if dpdk_conf.has('RTE_LIBRTE_RING_MEMPOOL')
+if dpdk_conf.has('RTE_MEMPOOL_RING')
 	test_deps += 'mempool_ring'
 endif
-if dpdk_conf.has('RTE_LIBRTE_STACK_MEMPOOL')
+if dpdk_conf.has('RTE_MEMPOOL_STACK')
 	test_deps += 'mempool_stack'
 endif
-if dpdk_conf.has('RTE_LIBRTE_SKELETON_EVENTDEV_PMD')
+if dpdk_conf.has('RTE_EVENT_SKELETON')
 	test_deps += 'event_skeleton'
 endif
-if dpdk_conf.has('RTE_LIBRTE_TELEMETRY')
+if dpdk_conf.has('RTE_LIB_TELEMETRY')
 	test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c']
 	fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]]
 endif
 
 # The following linkages of drivers are required because
 # they are used via a driver-specific API.
-if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
+if dpdk_conf.has('RTE_NET_BOND')
 	test_deps += 'net_bond'
 	test_sources += ['test_link_bonding.c', 'test_link_bonding_rssconf.c']
 	driver_test_names += ['link_bonding_autotest', 'link_bonding_rssconf_autotest']
-	if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
+	if dpdk_conf.has('RTE_NET_RING')
 		test_sources += 'test_link_bonding_mode4.c'
 		driver_test_names += 'link_bonding_mode4_autotest'
 	endif
 endif
-if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
+if dpdk_conf.has('RTE_NET_RING')
 	test_deps += 'net_ring'
 	test_sources += 'test_pmd_ring_perf.c'
 	test_sources += 'test_pmd_ring.c'
@@ -380,13 +384,13 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD')
 	fast_tests += [['pdump_autotest', true]]
 endif
 
-if dpdk_conf.has('RTE_LIBRTE_POWER')
+if dpdk_conf.has('RTE_LIB_POWER')
 	test_deps += 'power'
 endif
-if dpdk_conf.has('RTE_LIBRTE_KNI')
+if dpdk_conf.has('RTE_LIB_KNI')
 	test_deps += 'kni'
 endif
-if dpdk_conf.has('RTE_LIBRTE_PDUMP')
+if dpdk_conf.has('RTE_LIB_PDUMP')
 	test_deps += 'pdump'
 endif
 
@@ -403,8 +407,8 @@ cflags += '-fno-strict-aliasing'
 cflags += ['-DALLOW_INTERNAL_API']
 
 test_dep_objs = []
-if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV')
-	compress_test_dep = dependency('zlib', required: false)
+if dpdk_conf.has('RTE_LIB_COMPRESSDEV')
+	compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
 	if compress_test_dep.found()
 		test_dep_objs += compress_test_dep
 		test_sources += 'test_compressdev.c'
@@ -413,7 +417,7 @@ if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV')
 	endif
 endif
 
-if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER')
+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
 	driver_test_names += 'cryptodev_scheduler_autotest'
 	test_deps += 'crypto_scheduler'
 endif