From patchwork Wed May 27 14:57:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 70656 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6B68EA034E; Wed, 27 May 2020 16:58:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 20BD91DA9B; Wed, 27 May 2020 16:58:05 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 38D251DA95 for ; Wed, 27 May 2020 16:58:02 +0200 (CEST) IronPort-SDR: P9IzWQoIO3/C5lCG402rcuu3bFG3rxb7tVOuBDH99koCeIE3uri1KMCnHFPeSutLTnXddq1L0S slJgCQsRJu4g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2020 07:58:02 -0700 IronPort-SDR: ToG8LlL/vZzpcVQNs8WiA+aK7P/2bF+NJbHh24fTI/Af59CWZC6pvL4vCZraHj5m4+91Kx3WEW e10C3JxYNqHg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,441,1583222400"; d="scan'208";a="376050649" Received: from silpixa00399126.ir.intel.com ([10.237.222.239]) by fmsmga001.fm.intel.com with ESMTP; 27 May 2020 07:57:57 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , reshma.pattan@intel.com Date: Wed, 27 May 2020 15:57:45 +0100 Message-Id: <20200527145745.4060-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] app/test: fix build with ring pmd but no bond pmd 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" If the bonding pmd is disabled, all autotest associated with it should be disabled. However, some of those tests also depended upon the ring PMD so were placed in a block depending on that driver - and unfortunately that driver alone. This caused build failures if the ring PMD was enabled but the bonding PMD disabled, due to missing header files and driver libs. This error can be reproduced by configuring DPDK using e.g. meson configure -Ddisable_drivers=net/[!r]* build (which will disable all drivers not starting with "r"), and then building using ninja. Fix this by moving all link bonding autotests to the one block and putting a second conditional check within that block for those also requiring the ring PMD. Fixes: 7f6ef1664027 ("test/bonding: allow disabling driver") Fixes: 207b1c813f39 ("test: fix build without ring PMD") Cc: reshma.pattan@intel.com Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- app/test/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 1715ddbcb..dc2474699 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -350,6 +350,10 @@ if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') test_deps += 'pmd_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_LIBRTE_RING_PMD') + 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' @@ -358,7 +362,6 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD') 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]] @@ -366,7 +369,6 @@ 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