X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fmeson.build;h=0a2ce710f060e15ff7af623145b21995643feb88;hb=207b1c813f39;hp=501c805809ffdee36921ab03f80dff805af502bd;hpb=b35df4dd666ea7ef365d7f55824602b07512c660;p=dpdk.git diff --git a/app/test/meson.build b/app/test/meson.build index 501c805809..0a2ce710f0 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -7,13 +7,11 @@ endif test_sources = files('commands.c', 'packet_burst_generator.c', - 'sample_packet_forward.c', 'test.c', 'test_acl.c', 'test_alarm.c', 'test_atomic.c', 'test_barrier.c', - 'test_bitratestats.c', 'test_bpf.c', 'test_byteorder.c', 'test_cmdline.c', @@ -43,11 +41,14 @@ 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', 'test_fbarray.c', + 'test_fib.c', + 'test_fib_perf.c', + 'test_fib6.c', + 'test_fib6_perf.c', 'test_func_reentrancy.c', 'test_flow_classify.c', 'test_hash.c', @@ -55,15 +56,13 @@ test_sources = files('commands.c', 'test_hash_multiwriter.c', 'test_hash_readwrite.c', 'test_hash_perf.c', - 'test_hash_readwrite_lf.c', + 'test_hash_readwrite_lf_perf.c', 'test_interrupts.c', 'test_ipsec.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 +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', @@ -102,6 +98,7 @@ test_sources = files('commands.c', 'test_red.c', 'test_reorder.c', 'test_rib.c', + 'test_rib6.c', 'test_ring.c', 'test_ring_perf.c', 'test_rwlock.c', @@ -138,6 +135,7 @@ test_deps = ['acl', 'efd', 'ethdev', 'eventdev', + 'fib', 'flow_classify', 'hash', 'ipsec', @@ -181,6 +179,8 @@ fast_test_names = [ 'eal_fs_autotest', 'errno_autotest', 'event_ring_autotest', + 'fib_autotest', + 'fib6_autotest', 'func_reentrancy_autotest', 'flow_classify_autotest', 'hash_autotest', @@ -202,8 +202,8 @@ fast_test_names = [ 'rcu_qsbr_autotest', 'red_autotest', 'rib_autotest', + 'rib6_autotest', 'ring_autotest', - 'ring_pmd_autotest', 'rwlock_test1_autotest', 'rwlock_rda_autotest', 'rwlock_rds_wrm_autotest', @@ -218,21 +218,17 @@ fast_test_names = [ 'timer_autotest', 'user_delay_us', 'version_autotest', - 'bitratestats_autotest', 'crc_autotest', 'delay_us_sleep_autotest', 'distributor_autotest', 'eventdev_common_autotest', 'fbarray_autotest', - 'hash_readwrite_autotest', - 'hash_readwrite_lf_autotest', + 'hash_readwrite_func_autotest', 'ipsec_autotest', 'kni_autotest', 'kvargs_autotest', - 'latencystats_autotest', 'member_autotest', 'metrics_autotest', - 'pdump_autotest', 'power_cpufreq_autotest', 'power_autotest', 'power_kvm_vm_autotest', @@ -250,6 +246,9 @@ perf_test_names = [ 'reciprocal_division', 'reciprocal_division_perf', 'lpm_perf_autotest', + 'rib_slow_autotest', + 'fib_slow_autotest', + 'fib_perf_autotest', 'red_all', 'barrier_autotest', 'hash_multiwriter_autotest', @@ -259,14 +258,18 @@ perf_test_names = [ 'member_perf_autotest', 'efd_perf_autotest', 'lpm6_perf_autotest', + 'rib6_slow_autotest', + 'fib6_slow_autotest', + 'fib6_perf_autotest', 'rcu_qsbr_perf_autotest', 'red_perf', 'distributor_perf_autotest', - 'ring_pmd_perf_autotest', 'pmd_perf_autotest', 'stack_perf_autotest', 'stack_lf_perf_autotest', 'rand_perf_autotest', + 'hash_readwrite_perf_autotest', + 'hash_readwrite_lf_perf_autotest', ] driver_test_names = [ @@ -287,7 +290,6 @@ driver_test_names = [ 'eventdev_selftest_octeontx', 'eventdev_selftest_sw', 'link_bonding_autotest', - 'link_bonding_mode4_autotest', 'link_bonding_rssconf_autotest', 'rawdev_autotest', ] @@ -324,6 +326,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') @@ -383,23 +400,18 @@ dpdk_test = executable('dpdk-test', timeout_seconds = 600 timeout_seconds_fast = 10 -# Retrieve the number of CPU cores, defaulting to 4. -num_cores = '0-3' -if host_machine.system() == 'linux' - num_cores = run_command('cat', - '/sys/devices/system/cpu/present' - ).stdout().strip() -elif host_machine.system() == 'freebsd' - snum_cores = run_command('/sbin/sysctl', '-n', - 'hw.ncpu').stdout().strip() - inum_cores = snum_cores.to_int() - 1 - num_cores = '0-@0@'.format(inum_cores) -endif - -num_cores_arg = '-l ' + num_cores +get_coremask = find_program('get-coremask.sh') +num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip() 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], @@ -444,4 +456,3 @@ foreach arg : dump_test_names is_parallel : false, suite : 'debug-tests') endforeach -