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 2E1F4A04B3; Mon, 10 Feb 2020 10:05:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1489F1BE9C; Mon, 10 Feb 2020 10:05:03 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 28C0054AE for ; Mon, 10 Feb 2020 10:05:01 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 01:05:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,424,1574150400"; d="scan'208";a="237035485" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga006.jf.intel.com with ESMTP; 10 Feb 2020 01:04:59 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 10 Feb 2020 01:04:59 -0800 Received: from shsmsx153.ccr.corp.intel.com (10.239.6.53) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 10 Feb 2020 01:04:59 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.222]) by SHSMSX153.ccr.corp.intel.com ([169.254.12.97]) with mapi id 14.03.0439.000; Mon, 10 Feb 2020 17:04:57 +0800 From: "Tu, Lijuan" To: "Xiao, QimaiX" , "dts@dpdk.org" CC: "Xiao, QimaiX" Thread-Topic: [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1 Thread-Index: AQHV0a1YH+SNpCtykku8bO00d2Qwf6gUPvVw Date: Mon, 10 Feb 2020 09:04:56 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BBC57DA@SHSMSX101.ccr.corp.intel.com> References: <1579756846-85200-1-git-send-email-qimaix.xiao@intel.com> In-Reply-To: <1579756846-85200-1-git-send-email-qimaix.xiao@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [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" Applied, thanks > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai > Sent: Thursday, January 23, 2020 1:21 PM > To: dts@dpdk.org > Cc: Xiao, QimaiX > Subject: [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1 >=20 > update iavf path for dpdk20.02_rc1 >=20 > Signed-off-by: Xiao Qimai > --- > tests/TestSuite_iavf.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > 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 =3D '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): >=20 > self.vm0_dut_ports =3D self.vm_dut_0.get_ports('any') > self.vm0_testpmd =3D 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 =3D True > @@ -183,7 +183,7 @@ class TestIavf(TestCase): > netdev.bind_driver(driver=3Ddriver) >=20 > 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 =3D False > -- > 1.8.3.1