From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B92D4A04B1; Thu, 5 Nov 2020 02:53:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8353A4C99; Thu, 5 Nov 2020 02:53:49 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id C21BE377E for ; Thu, 5 Nov 2020 02:53:47 +0100 (CET) IronPort-SDR: jo51l6NPoKsvkKSxfzmklk5LX5UF4QG5ocCvGNBjbe4YaKqSzeJeQAiNiKUIwGugy1/6QSd4E0 hpbb70HO7Hpg== X-IronPort-AV: E=McAfee;i="6000,8403,9795"; a="169419190" X-IronPort-AV: E=Sophos;i="5.77,451,1596524400"; d="scan'208";a="169419190" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2020 17:53:45 -0800 IronPort-SDR: bxGwCZMUEcMUlH0ZPqi7O7nWvxPjeg/2mge9OtEPdQxuw1qMThRFkdkAKh6qD/+42LCNy++NzV OuxrUREl4QhQ== X-IronPort-AV: E=Sophos;i="5.77,451,1596524400"; d="scan'208";a="529166928" Received: from unknown (HELO localhost.localdomain) ([10.240.183.77]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2020 17:53:43 -0800 From: JiangYuX To: dts@dpdk.org Cc: JiangYu Date: Thu, 5 Nov 2020 09:53:49 +0000 Message-Id: <20201105095349.1706988-1-yux.jiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V2] tests/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 DPDK commit b0b672aea: PMD_PCAP has been defined by default, should not redefine. Signed-off-by: JiangYu --- tests/TestSuite_vm2vm_virtio_pmd.py | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py b/tests/TestSuite_vm2vm_virtio_pmd.py index a5c4032..9cb51a8 100644 --- a/tests/TestSuite_vm2vm_virtio_pmd.py +++ b/tests/TestSuite_vm2vm_virtio_pmd.py @@ -55,7 +55,6 @@ class TestVM2VMVirtioPMD(TestCase): self.socket_mem = ','.join(['1024']*socket_num) self.base_dir = self.dut.base_dir.replace('~', '/root') self.vhost_user = self.dut.new_session(suite="vhost") - self.enable_pcap_lib_in_dpdk(self.dut) self.virtio_user0 = None self.virtio_user1 = None self.pci_info = self.dut.ports_info[0]['pci'] @@ -86,22 +85,6 @@ class TestVM2VMVirtioPMD(TestCase): "There has not enough cores to test this case %s" % self.running_case) - def enable_pcap_lib_in_dpdk(self, client_dut): - """ - 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) - - 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) - def start_vhost_testpmd(self): """ launch the testpmd on vhost side @@ -359,8 +342,6 @@ class TestVM2VMVirtioPMD(TestCase): self.get_core_list(2) self.start_vhost_testpmd() self.start_vms(mode=0, mergeable=True) - # enable pcap in VM0 - self.enable_pcap_lib_in_dpdk(self.vm_dut[0]) # git the vm enough huge to run pdump self.vm_dut[0].set_huge_pages(2048) # start testpmd and pdump in VM0 @@ -375,8 +356,6 @@ class TestVM2VMVirtioPMD(TestCase): self.vm_dut[1].send_expect('start tx_first 10', 'testpmd> ', 30) # check the packet in vm0 self.check_packet_payload_valid(self.vm_dut[0]) - # reset the evn in vm - self.disable_pcap_lib_in_dpdk(self.vm_dut[0]) def test_vhost_vm2vm_virito_10_pmd_with_mergeable_path(self): """ @@ -388,8 +367,6 @@ class TestVM2VMVirtioPMD(TestCase): self.get_core_list(2) self.start_vhost_testpmd() self.start_vms(mode=1, mergeable=True) - # enable pcap in VM0 - self.enable_pcap_lib_in_dpdk(self.vm_dut[0]) # git the vm enough huge to run pdump self.vm_dut[0].set_huge_pages(2048) # start testpmd and pdump in VM0 @@ -404,8 +381,6 @@ class TestVM2VMVirtioPMD(TestCase): self.vm_dut[1].send_expect('start tx_first 10', 'testpmd> ', 30) # check the packet in vm0 self.check_packet_payload_valid(self.vm_dut[0]) - # reset the evn in vm - self.disable_pcap_lib_in_dpdk(self.vm_dut[0]) def test_vhost_vm2vm_virito_11_pmd_with_normal_path(self): """ @@ -429,8 +404,6 @@ class TestVM2VMVirtioPMD(TestCase): self.get_core_list(2) self.start_vhost_testpmd() self.start_vms(mode=2, mergeable=True) - # enable pcap in VM0 - self.enable_pcap_lib_in_dpdk(self.vm_dut[0]) # git the vm enough huge to run pdump self.vm_dut[0].set_huge_pages(2048) # start testpmd and pdump in VM0 @@ -445,8 +418,6 @@ class TestVM2VMVirtioPMD(TestCase): self.vm_dut[1].send_expect('start tx_first 10', 'testpmd> ', 30) # check the packet in vm0 self.check_packet_payload_valid(self.vm_dut[0]) - # reset the evn in vm - self.disable_pcap_lib_in_dpdk(self.vm_dut[0]) def tear_down(self): # @@ -461,5 +432,4 @@ class TestVM2VMVirtioPMD(TestCase): """ Run after each test suite. """ - self.disable_pcap_lib_in_dpdk(self.dut) self.dut.close_session(self.vhost_user) -- 2.7.4