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 59B82A0538; Thu, 23 Jan 2020 06:23:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1590F2B98; Thu, 23 Jan 2020 06:23:53 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 56677F04 for ; Thu, 23 Jan 2020 06:23:51 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2020 21:23:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,352,1574150400"; d="scan'208";a="286483836" Received: from unknown (HELO dpdk-xiaoqimai-dut.sh.intel.com) ([10.240.179.33]) by fmsmga001.fm.intel.com with ESMTP; 22 Jan 2020 21:23:49 -0800 From: Xiao Qimai To: dts@dpdk.org Cc: Xiao Qimai Date: Thu, 23 Jan 2020 13:20:46 +0800 Message-Id: <1579756846-85200-1-git-send-email-qimaix.xiao@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1 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" update iavf path for dpdk20.02_rc1 Signed-off-by: Xiao Qimai --- tests/TestSuite_iavf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_iavf.py b/tests/TestSuite_iavf.py index e227a76..d7b1104 100644 --- a/tests/TestSuite_iavf.py +++ b/tests/TestSuite_iavf.py @@ -84,7 +84,7 @@ class TestIavf(TestCase): else: self.vf_assign_method = 'vfio-pci' self.dut.send_expect('modprobe vfio-pci', '#') - self.dut.send_expect("sed -i -e '/IAVF_DEV_ID_ADAPTIVE_VF/s/0x1889/0x154c/g' drivers/net/iavf/base/iavf_devids.h", "# ") + self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") self.dut.build_install_dpdk(self.target) self.setup_vm_env() @@ -153,7 +153,7 @@ class TestIavf(TestCase): self.vm0_dut_ports = self.vm_dut_0.get_ports('any') self.vm0_testpmd = PmdOutput(self.vm_dut_0) - self.vm_dut_0.send_expect("sed -i -e '/IAVF_DEV_ID_ADAPTIVE_VF/s/0x1889/0x154c/g' drivers/net/iavf/base/iavf_devids.h", "# ") + self.vm_dut_0.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") self.vm_dut_0.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") self.vm_dut_0.build_install_dpdk(self.target) self.env_done = True @@ -183,7 +183,7 @@ class TestIavf(TestCase): netdev.bind_driver(driver=driver) def destroy_vm_env(self): - self.vm_dut_0.send_expect("sed -i -e '/IAVF_DEV_ID_ADAPTIVE_VF/s/0x154c/0x1889/g' drivers/net/iavf/base/iavf_devids.h", "# ") + self.vm_dut_0.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },/d' drivers/net/iavf/iavf_ethdev.c", "# ") self.vm_dut_0.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ") self.vm_dut_0.build_install_dpdk(self.target) if getattr(self, 'vm0', None): @@ -769,7 +769,7 @@ class TestIavf(TestCase): self.dut.send_expect("quit", "# ") if self.env_done is True: self.destroy_vm_env() - self.dut.send_expect("sed -i -e '/IAVF_DEV_ID_ADAPTIVE_VF/s/0x154c/0x1889/g' drivers/net/iavf/base/iavf_devids.h", "# ") + self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },/d' drivers/net/iavf/iavf_ethdev.c", "# ") self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ") self.dut.build_install_dpdk(self.target) self.env_done = False -- 1.8.3.1