From patchwork Wed Jan 19 18:09:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106087 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 21457A0032; Wed, 19 Jan 2022 19:34:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10DB241190; Wed, 19 Jan 2022 19:34:06 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id CEE6941147 for ; Wed, 19 Jan 2022 19:34:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617245; x=1674153245; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LS7QyT0QGqu8jsTfd5PmhQljUGSuMMrRSg7aqq6K+U8=; b=fRorJ+8IKNiMNswyPZQfSAjray9tinuOJ9DquWNJ3tFQx8hmMmuh/2cO O1me3kfn6NCu2Y2jSYU7+u0k+1mBWW3De6V+HODDCDLeg/8mj6mQkF1vs Aq/PN0gh7WlFpDbrUkH/U+ME2MlrxGj5I8xbGe/2Ix8eDue0yv/GZgZh6 i7ZKmZxx2YXVGS2S+iv2sdrxfIlHwuLgxZPwfj/+72cyrwrxkDYrN1mbx zo6c+JVqXih7duhTU6rSK8aPSpvvEj+TOhF28aNbekXvgKb0br7AJMDdm ylZB8gpEm6kng/F00KE0g/2UftIDUYMfnY8hG/jKdMB/o5aWngn+8+LGG w==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496452" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496452" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907370" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:23 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 2/6] app/test: link unit test binary against all available libs Date: Wed, 19 Jan 2022 18:09:58 +0000 Message-Id: <20220119181002.471195-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Rather than maintaining a list of the libraries the unit tests need, and having to conditionally include/omit optional libs from the list, we can just link against all available libraries, simplifying the code considerably. Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- app/test/meson.build | 49 +++----------------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 344a609a4d..210e03fbff 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -157,39 +157,9 @@ test_sources = files( 'virtual_pmd.c', ) -test_deps = [ - 'acl', - 'bus_pci', - 'bus_vdev', - 'bpf', - 'cfgfile', - 'cmdline', - 'cryptodev', - 'distributor', - 'dmadev', - 'efd', - 'ethdev', - 'eventdev', - 'fib', - 'flow_classify', - 'graph', - 'hash', - 'ipsec', - 'lpm', - 'member', - 'node', - 'pipeline', - 'port', - 'rawdev', - 'rcu', - 'reorder', - 'rib', - 'ring', - 'security', - 'stack', - 'telemetry', - 'timer', -] +test_deps = enabled_libs +# as well as libs, the pci and vdev bus drivers are needed for a lot of tests +test_deps += ['bus_pci', 'bus_vdev'] # Each test is marked with flag true/false # to indicate whether it can run in no-huge mode. @@ -380,7 +350,6 @@ if dpdk_conf.has('RTE_EVENT_SKELETON') test_deps += 'event_skeleton' endif if dpdk_conf.has('RTE_LIB_METRICS') - test_deps += 'metrics' test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true]] endif @@ -410,17 +379,14 @@ if dpdk_conf.has('RTE_NET_RING') perf_test_names += 'ring_pmd_perf_autotest' fast_tests += [['event_eth_tx_adapter_autotest', false]] if dpdk_conf.has('RTE_LIB_BITRATESTATS') - test_deps += 'bitratestats' test_sources += 'test_bitratestats.c' fast_tests += [['bitratestats_autotest', true]] endif if dpdk_conf.has('RTE_LIB_LATENCYSTATS') - test_deps += 'latencystats' test_sources += 'test_latencystats.c' fast_tests += [['latencystats_autotest', true]] endif if dpdk_conf.has('RTE_LIB_PDUMP') - test_deps += 'pdump' test_sources += 'test_pdump.c' fast_tests += [['pdump_autotest', true]] endif @@ -434,18 +400,10 @@ endif if dpdk_conf.has('RTE_HAS_LIBPCAP') ext_deps += pcap_dep if dpdk_conf.has('RTE_LIB_PCAPNG') - test_deps += 'pcapng' test_sources += 'test_pcapng.c' endif endif -if dpdk_conf.has('RTE_LIB_POWER') - test_deps += 'power' -endif -if dpdk_conf.has('RTE_LIB_KNI') - test_deps += 'kni' -endif - if cc.has_argument('-Wno-format-truncation') cflags += '-Wno-format-truncation' endif @@ -462,7 +420,6 @@ if dpdk_conf.has('RTE_LIB_COMPRESSDEV') if compress_test_dep.found() test_dep_objs += compress_test_dep test_sources += 'test_compressdev.c' - test_deps += 'compressdev' fast_tests += [['compressdev_autotest', false]] endif endif