From patchwork Fri Oct 23 15:48:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 81896 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 96D8DA04DF; Fri, 23 Oct 2020 09:47:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B58D9AFE; Fri, 23 Oct 2020 09:47:44 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id B26D37DF8 for ; Fri, 23 Oct 2020 09:47:42 +0200 (CEST) IronPort-SDR: RhB/+6hiLNqYqsEpdj5wTVWD6u6Iu5+HE7yM1v6ptTjcn1OlpaMhj6Gs3XpMK3Hx23uOEhybXL HE3Ikr+ydl3Q== X-IronPort-AV: E=McAfee;i="6000,8403,9782"; a="185338349" X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="185338349" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2020 00:47:40 -0700 IronPort-SDR: 55Kpve6dVlOJDYW2Qsy7X29DeAsjA/vtx24uzTUmgzgLPCQvDOksPPyRzokEy9fxXkxIi0ytGS f3yEHzPavVsw== X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="534302719" Received: from unknown (HELO localhost.localdomain) ([10.240.183.77]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2020 00:47:38 -0700 From: JiangYuX To: dts@dpdk.org Cc: JiangYu Date: Fri, 23 Oct 2020 15:48:27 +0000 Message-Id: <20201023154828.1274699-2-yux.jiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023154828.1274699-1-yux.jiang@intel.com> References: <20201023154828.1274699-1-yux.jiang@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V1 1/2] tests/TestSuite_vm2vm_virtio_pmd: Adapt RTE_LIBRTE_PMD_PCAP updates X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" From: JiangYu For DPDK commit: b0b672aea, PMD_PCAP has been defined by default, should not redefine. Signed-off-by: JiangYu --- tests/TestSuite_vm2vm_virtio_pmd.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py b/tests/TestSuite_vm2vm_virtio_pmd.py index a5c4032..e421285 100644 --- a/tests/TestSuite_vm2vm_virtio_pmd.py +++ b/tests/TestSuite_vm2vm_virtio_pmd.py @@ -90,17 +90,17 @@ class TestVM2VMVirtioPMD(TestCase): """ enable pcap lib in dpdk code and recompile """ - client_dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_PCAP=n$/CONFIG_RTE_LIBRTE_PMD_PCAP=y/' config/common_base", "#") - client_dut.set_build_options({'RTE_LIBRTE_PMD_PCAP': 'y'}) - client_dut.build_install_dpdk(self.target) + if self.dut.build_type == 'makefile': + client_dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_PCAP=n$/CONFIG_RTE_LIBRTE_PMD_PCAP=y/' config/common_base", "#") + client_dut.build_install_dpdk(self.target) def disable_pcap_lib_in_dpdk(self, client_dut): """ reset pcap lib in dpdk and recompile """ - client_dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_PCAP=y$/CONFIG_RTE_LIBRTE_PMD_PCAP=n/' config/common_base", "#") - client_dut.set_build_options({'RTE_LIBRTE_PMD_PCAP': 'n'}) - client_dut.build_install_dpdk(self.target) + if self.dut.build_type == 'makefile': + client_dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_PMD_PCAP=y$/CONFIG_RTE_LIBRTE_PMD_PCAP=n/' config/common_base", "#") + client_dut.build_install_dpdk(self.target) def start_vhost_testpmd(self): """ From patchwork Fri Oct 23 15:48:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 81898 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 B5EB4A04DE; Fri, 23 Oct 2020 09:47:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ADEB29AF4; Fri, 23 Oct 2020 09:47:58 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 377B67DF8 for ; Fri, 23 Oct 2020 09:47:56 +0200 (CEST) IronPort-SDR: e8eBckp5VYDpvA29wrDXU9cRZn+TrVHt2iRLvZmUI+2iRJavFfbgPuLWAS1LTLysBHwDRs5qm2 xog5DRecwmDg== X-IronPort-AV: E=McAfee;i="6000,8403,9782"; a="147500919" X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="147500919" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2020 00:47:49 -0700 IronPort-SDR: jFQUjexMQElIAoWgXWpUaLx6O/F+ptAAwa6VPYvP9MQA4M6i6HAG5DJ7E+e+1P6p5KRB0Jw/HQ r39Ot880ua4Q== X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="534302742" Received: from unknown (HELO localhost.localdomain) ([10.240.183.77]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2020 00:47:43 -0700 From: JiangYuX To: dts@dpdk.org Cc: JiangYu Date: Fri, 23 Oct 2020 15:48:28 +0000 Message-Id: <20201023154828.1274699-3-yux.jiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023154828.1274699-1-yux.jiang@intel.com> References: <20201023154828.1274699-1-yux.jiang@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V1 2/2] tests/TestSuite_vm2vm_virtio_user: Adapt RTE_LIBRTE_PMD_PCAP updates X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" From: JiangYu For DPDK commit: b0b672aea, PMD_PCAP has been defined by default, should not redefine. Signed-off-by: JiangYu --- tests/TestSuite_vm2vm_virtio_user.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_user.py b/tests/TestSuite_vm2vm_virtio_user.py index d2dfb97..b35dc60 100644 --- a/tests/TestSuite_vm2vm_virtio_user.py +++ b/tests/TestSuite_vm2vm_virtio_user.py @@ -99,11 +99,13 @@ class TestVM2VMVirtioUser(TestCase): """ enable pcap lib in dpdk code and recompile """ - client_dut.send_expect("sed -i 's/%s=n$/%s=y/' config/common_base" % ( + if self.dut.build_type == 'makefile': + client_dut.send_expect("sed -i 's/%s=n$/%s=y/' config/common_base" % ( self.config_value, self.config_value), '# ') - client_dut.set_build_options({'RTE_LIBRTE_PMD_PCAP': 'y'}) - client_dut.build_install_dpdk(self.target) - self.rebuild_flag = True + client_dut.build_install_dpdk(self.target) + self.rebuild_flag = True + else: + self.rebuild_flag = False def disable_pcap_lib_in_dpdk(self, client_dut): """