X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fmeson.build;h=6dffae832b05218543c0c195e0f3fa63ef78a084;hb=5908e7e837a62fe62c48094d8c2e947242f8fac3;hp=c5e65fe66d6a4151c6d445bac9ab01b872160672;hpb=302ea8e0fab497c55aaae51ebf084817958dec23;p=dpdk.git diff --git a/app/test/meson.build b/app/test/meson.build index c5e65fe66d..6dffae832b 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -1,6 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if not get_option('tests') + subdir_done() +endif + test_sources = files('commands.c', 'packet_burst_generator.c', 'sample_packet_forward.c', @@ -58,6 +62,7 @@ test_sources = files('commands.c', 'test_latencystats.c', 'test_link_bonding.c', 'test_link_bonding_mode4.c', + 'test_link_bonding_rssconf.c', 'test_logs.c', 'test_lpm.c', 'test_lpm6.c', @@ -82,9 +87,13 @@ test_sources = files('commands.c', 'test_pmd_ring.c', 'test_pmd_ring_perf.c', 'test_power.c', - 'test_power_acpi_cpufreq.c', + 'test_power_cpufreq.c', 'test_power_kvm_vm.c', 'test_prefetch.c', + 'test_rand_perf.c', + 'test_rawdev.c', + 'test_rcu_qsbr.c', + 'test_rcu_qsbr_perf.c', 'test_reciprocal_division.c', 'test_reciprocal_division_perf.c', 'test_red.c', @@ -95,6 +104,8 @@ test_sources = files('commands.c', 'test_sched.c', 'test_service_cores.c', 'test_spinlock.c', + 'test_stack.c', + 'test_stack_perf.c', 'test_string_fns.c', 'test_table.c', 'test_table_acl.c', @@ -107,6 +118,7 @@ test_sources = files('commands.c', 'test_timer.c', 'test_timer_perf.c', 'test_timer_racecond.c', + 'test_timer_secondary.c', 'test_ticketlock.c', 'test_version.c', 'virtual_pmd.c' @@ -131,13 +143,15 @@ test_deps = ['acl', 'metrics', 'pipeline', 'port', + 'rawdev', + 'rcu', 'reorder', 'ring', + 'stack', 'timer' ] -# All test cases in fast_parallel_test_names list are parallel -fast_parallel_test_names = [ +fast_test_names = [ 'acl_autotest', 'alarm_autotest', 'atomic_autotest', @@ -147,7 +161,18 @@ fast_parallel_test_names = [ 'cpuflags_autotest', 'cycles_autotest', 'debug_autotest', - 'eal_flags_autotest', + 'eal_flags_c_opt_autotest', + 'eal_flags_master_opt_autotest', + 'eal_flags_n_opt_autotest', + 'eal_flags_hpet_autotest', + 'eal_flags_no_huge_autotest', + 'eal_flags_w_opt_autotest', + 'eal_flags_b_opt_autotest', + 'eal_flags_vdev_opt_autotest', + 'eal_flags_r_opt_autotest', + 'eal_flags_mem_autotest', + 'eal_flags_file_prefix_autotest', + 'eal_flags_misc_autotest', 'eal_fs_autotest', 'errno_autotest', 'event_ring_autotest', @@ -168,37 +193,32 @@ fast_parallel_test_names = [ 'multiprocess_autotest', 'per_lcore_autotest', 'prefetch_autotest', + 'rcu_qsbr_autotest', 'red_autotest', 'ring_autotest', 'ring_pmd_autotest', - 'rwlock_autotest', + 'rwlock_test1_autotest', + 'rwlock_rda_autotest', + 'rwlock_rds_wrm_autotest', + 'rwlock_rde_wro_autotest', 'sched_autotest', 'spinlock_autotest', + 'stack_autotest', + 'stack_lf_autotest', 'string_autotest', 'table_autotest', 'tailq_autotest', 'timer_autotest', 'user_delay_us', 'version_autotest', -] - -# All test cases in fast_non_parallel_test_names list are non-parallel -fast_non_parallel_test_names = [ 'bitratestats_autotest', - 'cryptodev_sw_armv8_autotest', 'crc_autotest', - 'cryptodev_openssl_asym_autotest', - 'cryptodev_sw_mvsam_autotest', 'delay_us_sleep_autotest', - 'devargs_autotest', 'distributor_autotest', 'eventdev_common_autotest', - 'eventdev_octeontx_autotest', - 'eventdev_sw_autotest', 'fbarray_autotest', 'hash_readwrite_autotest', 'hash_readwrite_lf_autotest', - 'hash_scaling_autotest', 'ipsec_autotest', 'kni_autotest', 'kvargs_autotest', @@ -206,7 +226,7 @@ fast_non_parallel_test_names = [ 'member_autotest', 'metrics_autotest', 'pdump_autotest', - 'power_acpi_cpufreq_autotest', + 'power_cpufreq_autotest', 'power_autotest', 'power_kvm_vm_autotest', 'reorder_autotest', @@ -214,7 +234,6 @@ fast_non_parallel_test_names = [ 'thash_autotest', ] -# All test cases in perf_test_names list are non-parallel perf_test_names = [ 'ring_perf_autotest', 'mempool_perf_autotest', @@ -230,36 +249,41 @@ perf_test_names = [ 'timer_racecond_autotest', 'efd_autotest', 'hash_functions_autotest', - 'eventdev_selftest_sw', 'member_perf_autotest', 'efd_perf_autotest', 'lpm6_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', ] -# All test cases in driver_test_names list are non-parallel driver_test_names = [ - 'link_bonding_autotest', - 'link_bonding_mode4_autotest', - 'link_bonding_rssconf_autotest', - 'cryptodev_sw_mrvl_autotest', - 'cryptodev_dpaa2_sec_autotest', - 'cryptodev_dpaa_sec_autotest', - 'cryptodev_qat_autotest', 'cryptodev_aesni_mb_autotest', - 'cryptodev_openssl_autotest', - 'cryptodev_scheduler_autotest', 'cryptodev_aesni_gcm_autotest', + 'cryptodev_dpaa_sec_autotest', + 'cryptodev_dpaa2_sec_autotest', 'cryptodev_null_autotest', - 'cryptodev_sw_snow3g_autotest', + 'cryptodev_openssl_autotest', + 'cryptodev_openssl_asym_autotest', + 'cryptodev_qat_autotest', + 'cryptodev_sw_armv8_autotest', 'cryptodev_sw_kasumi_autotest', + 'cryptodev_sw_mvsam_autotest', + 'cryptodev_sw_snow3g_autotest', 'cryptodev_sw_zuc_autotest', + 'eventdev_selftest_octeontx', + 'eventdev_selftest_sw', + 'link_bonding_autotest', + 'link_bonding_mode4_autotest', + 'link_bonding_rssconf_autotest', + 'rawdev_autotest', ] -# All test cases in dump_test_names list are non-parallel dump_test_names = [ 'dump_struct_sizes', 'dump_mempool', @@ -308,10 +332,14 @@ if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') test_dep_objs += compress_test_dep test_sources += 'test_compressdev.c' test_deps += 'compressdev' - fast_non_parallel_test_names += 'compressdev_autotest' + fast_test_names += 'compressdev_autotest' endif endif +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') + driver_test_names += 'cryptodev_scheduler_autotest' +endif + foreach d:test_deps def_lib = get_option('default_library') test_dep_objs += get_variable(def_lib + '_rte_' + d) @@ -323,57 +351,78 @@ if get_option('default_library') == 'static' link_libs = dpdk_drivers endif -if get_option('tests') - dpdk_test = executable('dpdk-test', - test_sources, - link_whole: link_libs, - dependencies: test_dep_objs, - c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'], - install_rpath: driver_install_path, - install: false) +dpdk_test = executable('dpdk-test', + test_sources, + link_whole: link_libs, + dependencies: test_dep_objs, + c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'], + install_rpath: driver_install_path, + install: false) - # some perf tests (eg: memcpy perf autotest)take very long - # to complete, so timeout to 10 minutes - timeout_seconds = 600 - timeout_seconds_fast = 10 +# some perf tests (eg: memcpy perf autotest)take very long +# to complete, so timeout to 10 minutes +timeout_seconds = 600 +timeout_seconds_fast = 10 - foreach arg : fast_parallel_test_names - test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - args : ['-c f','-n 4', '--file-prefix=@0@'.format(arg)], - timeout : timeout_seconds_fast, - suite : 'fast-tests') - endforeach +# 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 - foreach arg : fast_non_parallel_test_names +num_cores_arg = '-l ' + num_cores + +test_args = [num_cores_arg] +foreach arg : fast_test_names + if host_machine.system() == 'linux' + test(arg, dpdk_test, + env : ['DPDK_TEST=' + arg], + args : test_args + + ['--file-prefix=@0@'.format(arg)], + timeout : timeout_seconds_fast, + is_parallel : false, + suite : 'fast-tests') + else test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - timeout : timeout_seconds_fast, - is_parallel : false, - suite : 'fast-tests') - endforeach + args : test_args, + timeout : timeout_seconds_fast, + is_parallel : false, + suite : 'fast-tests') + endif +endforeach - foreach arg : perf_test_names - test(arg, dpdk_test, +foreach arg : perf_test_names + test(arg, dpdk_test, + env : ['DPDK_TEST=' + arg], + args : test_args, + timeout : timeout_seconds, + is_parallel : false, + suite : 'perf-tests') +endforeach + +foreach arg : driver_test_names + test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], + args : test_args, timeout : timeout_seconds, is_parallel : false, - suite : 'perf-tests') - endforeach + suite : 'driver-tests') +endforeach - foreach arg : driver_test_names - test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - timeout : timeout_seconds, - is_parallel : false, - suite : 'driver-tests') - endforeach +foreach arg : dump_test_names + test(arg, dpdk_test, + env : ['DPDK_TEST=' + arg], + args : test_args, + timeout : timeout_seconds, + is_parallel : false, + suite : 'debug-tests') +endforeach - foreach arg : dump_test_names - test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - timeout : timeout_seconds, - is_parallel : false, - suite : 'debug-tests') - endforeach -endif