X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fmeson.build;h=88c831a92e46bb20f1a5a2e9c7eba186f51571a2;hb=d827f610d38683184178158bc8fd625f061229b6;hp=279457fe42219f9d6051a2b0f7385f19d87d91fd;hpb=52af6ccb2b39b91b2cb48a11510392ca480d7f99;p=dpdk.git diff --git a/app/test/meson.build b/app/test/meson.build index 279457fe42..88c831a92e 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -12,6 +12,7 @@ test_sources = files('commands.c', 'test_alarm.c', 'test_atomic.c', 'test_barrier.c', + 'test_bitops.c', 'test_bpf.c', 'test_byteorder.c', 'test_cmdline.c', @@ -38,6 +39,7 @@ test_sources = files('commands.c', 'test_efd.c', 'test_efd_perf.c', 'test_errno.c', + 'test_ethdev_link.c', 'test_event_crypto_adapter.c', 'test_event_eth_rx_adapter.c', 'test_event_ring.c', @@ -63,10 +65,10 @@ test_sources = files('commands.c', 'test_ipfrag.c', 'test_ipsec.c', 'test_ipsec_sad.c', + 'test_ipsec_perf.c', 'test_kni.c', 'test_kvargs.c', - 'test_link_bonding.c', - 'test_link_bonding_rssconf.c', + 'test_lcores.c', 'test_logs.c', 'test_lpm.c', 'test_lpm6.c', @@ -105,9 +107,12 @@ test_sources = files('commands.c', 'test_ring.c', 'test_ring_mpmc_stress.c', 'test_ring_hts_stress.c', - 'test_ring_peek_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', @@ -138,6 +143,8 @@ test_sources = files('commands.c', ) test_deps = ['acl', + 'bus_pci', + 'bus_vdev', 'bitratestats', 'bpf', 'cfgfile', @@ -166,6 +173,7 @@ test_deps = ['acl', 'ring', 'security', 'stack', + 'telemetry', 'timer' ] @@ -175,6 +183,7 @@ fast_tests = [ ['acl_autotest', true], ['alarm_autotest', false], ['atomic_autotest', false], + ['bitops_autotest', true], ['byteorder_autotest', true], ['cmdline_autotest', true], ['common_autotest', true], @@ -182,7 +191,7 @@ 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], @@ -195,6 +204,7 @@ fast_tests = [ ['eal_flags_misc_autotest', false], ['eal_fs_autotest', true], ['errno_autotest', true], + ['ethdev_link_status', true], ['event_ring_autotest', true], ['fib_autotest', true], ['fib6_autotest', true], @@ -203,6 +213,7 @@ fast_tests = [ ['hash_autotest', true], ['interrupt_autotest', true], ['ipfrag_autotest', false], + ['lcores_autotest', true], ['logs_autotest', true], ['lpm_autotest', true], ['lpm6_autotest', true], @@ -291,6 +302,7 @@ perf_test_names = [ 'hash_readwrite_perf_autotest', 'hash_readwrite_lf_perf_autotest', 'trace_perf_autotest', + 'ipsec_perf_autotest', ] driver_test_names = [ @@ -310,8 +322,6 @@ driver_test_names = [ 'cryptodev_sw_zuc_autotest', 'eventdev_selftest_octeontx', 'eventdev_selftest_sw', - 'link_bonding_autotest', - 'link_bonding_rssconf_autotest', 'rawdev_autotest', ] @@ -330,33 +340,38 @@ 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') - test_deps += 'pmd_skeleton_event' +if dpdk_conf.has('RTE_EVENT_SKELETON') + test_deps += 'event_skeleton' endif -if dpdk_conf.has('RTE_LIBRTE_TELEMETRY') - test_sources += 'test_telemetry_json.c' - fast_tests += [['telemetry_json_autotest', true]] +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') - test_deps += 'pmd_bond' +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_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') - test_deps += 'pmd_ring' +if dpdk_conf.has('RTE_NET_RING') + test_deps += 'net_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_tests += [['ring_pmd_autotest', true]] @@ -364,17 +379,16 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD') fast_tests += [['event_eth_tx_adapter_autotest', false]] fast_tests += [['bitratestats_autotest', true]] fast_tests += [['latencystats_autotest', true]] - driver_test_names += 'link_bonding_mode4_autotest' 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 @@ -387,8 +401,11 @@ cflags += '-D_GNU_SOURCE' # Strict-aliasing rules are violated by uint8_t[] to context size casts. cflags += '-fno-strict-aliasing' +# Enable using internal APIs in unit tests +cflags += ['-DALLOW_INTERNAL_API'] + test_dep_objs = [] -if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') +if dpdk_conf.has('RTE_LIB_COMPRESSDEV') compress_test_dep = dependency('zlib', required: false) if compress_test_dep.found() test_dep_objs += compress_test_dep @@ -398,8 +415,9 @@ 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 foreach d:test_deps @@ -409,18 +427,17 @@ endforeach test_dep_objs += cc.find_library('execinfo', required: false) link_libs = [] -link_nodes = [] if get_option('default_library') == 'static' - link_libs = dpdk_drivers - link_nodes = dpdk_graph_nodes + link_libs = dpdk_static_libraries + dpdk_drivers endif dpdk_test = executable('dpdk-test', test_sources, - link_whole: link_libs + link_nodes, + link_whole: link_libs, dependencies: test_dep_objs, c_args: cflags, - install_rpath: driver_install_path, + install_rpath: join_paths(get_option('prefix'), + driver_install_path), install: true) has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'