From patchwork Mon Dec 18 11:53:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Van Haaren, Harry" X-Patchwork-Id: 32357 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 631A21B012; Mon, 18 Dec 2017 12:53:56 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id CEAD4374E for ; Mon, 18 Dec 2017 12:53:53 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Dec 2017 03:53:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,422,1508828400"; d="scan'208";a="187968898" Received: from silpixa00398672.ir.intel.com ([10.237.223.128]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2017 03:53:51 -0800 From: Harry van Haaren To: dev@dpdk.org Cc: bruce.richardson@intel.com, Harry van Haaren Date: Mon, 18 Dec 2017 11:53:58 +0000 Message-Id: <1513598038-148115-3-git-send-email-harry.van.haaren@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513598038-148115-1-git-send-email-harry.van.haaren@intel.com> References: <1513598038-148115-1-git-send-email-harry.van.haaren@intel.com> Subject: [dpdk-dev] [PATCH 2/2] meson: add tests app to build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch enables the test/test app to be built. It also adds the test binary to be a meson-test, which allows the meson test infrastructure to be used to run tests. Tests are listed using the same test binary, however each test sets a different DPDK_TEST environment variable. The string contents of this DPDK_TEST env var is entered in the command line interface. As such, the familiar test names such as "ring_perf_autotest" etc are valid tests to run using this meson test infrastructure. Note that the tests are run serially, given that we cannot run multiple primary processes at a time. As each test must initialize EAL this takes some time depending on the number of hugepages. In future, we could improve this to run multiple tests from one EAL init, but it is out of scope for this patchset. Finally, an option to build the tests is added to the meson build options. When disabled, the unit test code in test/test is not compiled. The default is set to 'true'. To disable, run: $ meson configure -Dtests=false Signed-off-by: Harry van Haaren --- meson.build | 1 + meson_options.txt | 2 + test/meson.build | 32 +++++++ test/test/meson.build | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 283 insertions(+) create mode 100644 test/meson.build create mode 100644 test/test/meson.build diff --git a/meson.build b/meson.build index 04eea72..9132594 100644 --- a/meson.build +++ b/meson.build @@ -60,6 +60,7 @@ subdir('drivers') # build binaries and installable tools subdir('usertools') subdir('app') +subdir('test') # build any examples explicitly requested - useful for developers if get_option('examples') != '' diff --git a/meson_options.txt b/meson_options.txt index f2558fe..1a674aa 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,3 +18,5 @@ option('per_library_versions', type: 'boolean', value: true, description: 'true: each lib gets its own version number, false: DPDK version used for each lib') option('use_hpet', type: 'boolean', value: false, description: 'use HPET timer in EAL') +option('tests', type: 'boolean', value: true, + description: 'build unit tests') diff --git a/test/meson.build b/test/meson.build new file mode 100644 index 0000000..4250eb7 --- /dev/null +++ b/test/meson.build @@ -0,0 +1,32 @@ +# BSD LICENSE +# +# Copyright(c) 2017 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +subdir('test') diff --git a/test/test/meson.build b/test/test/meson.build new file mode 100644 index 0000000..1a4f894 --- /dev/null +++ b/test/test/meson.build @@ -0,0 +1,248 @@ +# BSD LICENSE +# +# Copyright(c) 2017 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +test_sources = files('commands.c', + 'packet_burst_generator.c', + 'test.c', + 'test_acl.c', + 'test_alarm.c', + 'test_atomic.c', + 'test_byteorder.c', + 'test_cmdline.c', + 'test_cmdline_cirbuf.c', + 'test_cmdline_etheraddr.c', + 'test_cmdline_ipaddr.c', + 'test_cmdline_lib.c', + 'test_cmdline_num.c', + 'test_cmdline_portlist.c', + 'test_cmdline_string.c', + 'test_common.c', + 'test_cpuflags.c', + 'test_crc.c', + 'test_cycles.c', + 'test_debug.c', + 'test_devargs.c', + 'test_distributor.c', + 'test_distributor_perf.c', + 'test_eal_flags.c', + 'test_eal_fs.c', + 'test_efd.c', + 'test_efd_perf.c', + 'test_errno.c', + 'test_event_ring.c', + 'test_eventdev.c', + 'test_eventdev_octeontx.c', + 'test_eventdev_sw.c', + 'test_func_reentrancy.c', + 'test_hash.c', + 'test_hash_functions.c', + 'test_hash_multiwriter.c', + 'test_hash_perf.c', + 'test_hash_scaling.c', + 'test_interrupts.c', + 'test_kni.c', + 'test_kvargs.c', + 'test_logs.c', + 'test_lpm.c', + 'test_lpm6.c', + 'test_lpm6_perf.c', + 'test_lpm_perf.c', + 'test_malloc.c', + 'test_mbuf.c', + 'test_memcpy.c', + 'test_memcpy_perf.c', + 'test_memory.c', + 'test_mempool.c', + 'test_mempool_perf.c', + 'test_memzone.c', + 'test_meter.c', + 'test_mp_secondary.c', + 'test_per_lcore.c', + 'test_pmd_perf.c', + 'test_power.c', + 'test_power_acpi_cpufreq.c', + 'test_power_kvm_vm.c', + 'test_prefetch.c', + 'test_red.c', + 'test_reorder.c', + 'test_ring.c', + 'test_ring_perf.c', + 'test_rwlock.c', + 'test_sched.c', + 'test_service_cores.c', + 'test_spinlock.c', + 'test_string_fns.c', + 'test_table.c', + 'test_table_acl.c', + 'test_table_combined.c', + 'test_table_pipeline.c', + 'test_table_ports.c', + 'test_table_tables.c', + 'test_tailq.c', + 'test_thash.c', + 'test_timer.c', + 'test_timer_perf.c', + 'test_timer_racecond.c', + 'test_version.c', + 'virtual_pmd.c' +) + +test_deps = ['acl', + 'cfgfile', + 'cmdline', + 'cryptodev', + 'distributor', + 'efd', + 'ethdev', + 'eventdev', + 'hash', + 'lpm', + 'pipeline', + 'port', + 'power', + 'reorder', + 'ring', + 'timer' +] + +test_names = [ + 'acl_autotest', + 'alarm_autotest', + 'atomic_autotest', + 'byteorder_autotest', + 'cmdline_autotest', + 'common_autotest', + 'cpuflags_autotest', + 'crc_autotest', + 'cycles_autotest', + 'debug_autotest', + 'devargs_autotest', + 'distributor_autotest', + 'distributor_perf_autotest', + 'eal_flags_autotest', + 'eal_fs_autotest', + 'efd_autotest', + 'efd_perf_autotest', + 'errno_autotest', + 'event_ring_autotest', + 'eventdev_common_autotest', + 'eventdev_octeontx_autotest', + 'eventdev_sw_autotest', + 'func_reentrancy_autotest', + 'has_scaling_autotest', + 'hash_autotest', + 'hash_functions_autotest', + 'hash_multiwriter_autotest', + 'hash_perf_autotest', + 'interrupt_autotest', + 'kni_autotest', + 'kvargs_autotest', + 'logs_autotest', + 'lpm6_autotest', + 'lpm6_perf_autotest', + 'lpm_autotest', + 'lpm_perf_autotest', + 'malloc_autotest', + 'mbuf_autotest', + 'memcpy_autotest', + 'memcpy_perf_autotest', + 'memory_autotest', + 'mempool_autotest', + 'mempool_perf_autotest', + 'memzone_autotest', + 'meter_autotest', + 'multiprocess_autotest', + 'per_lcore_autotest', + 'pmd_perf_autotest', + 'power_acpi_cpufreq_autotest', + 'power_autotest', + 'power_kvm_vm_autotest', + 'prefetch_autotest', + 'red_all', + 'red_autotest', + 'red_perf', + 'reorder_autotest', + 'ring_autotest', + 'ring_perf_autotest', + 'rwlock_autotest', + 'sched_autotest', + 'service_autotest', + 'spinlock_autotest', + 'table_autotest', + 'tailq_autotest', + 'thash_autotest', + 'timer_autotest', + 'timer_perf__autotest', + 'timer_racecond_autotest', + 'user_delay_us', + 'version_autotest', +] + +if dpdk_conf.has('RTE_LIBRTE_PDUMP') + test_deps += 'pdump' +endif +if dpdk_conf.has('RTE_LIBRTE_I40E_PMD') + test_deps += 'pmd_i40e' +endif +if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') + test_deps += 'pmd_ixgbe' +endif + +test_dep_objs = [] +foreach d:test_deps + def_lib = get_option('default_library') + test_dep_objs += get_variable(def_lib + '_rte_' + d) +endforeach + +link_libs = [] +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, + 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 + + foreach t:test_names + test(t, dpdk_test, + env : ['DPDK_TEST='+t], + timeout : timeout_seconds, + is_parallel : false) + endforeach +endif