* [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1
@ 2020-01-23 5:20 Xiao Qimai
2020-02-10 9:04 ` Tu, Lijuan
0 siblings, 1 reply; 2+ messages in thread
From: Xiao Qimai @ 2020-01-23 5:20 UTC (permalink / raw)
To: dts; +Cc: Xiao Qimai
update iavf path for dpdk20.02_rc1
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1
2020-01-23 5:20 [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1 Xiao Qimai
@ 2020-02-10 9:04 ` Tu, Lijuan
0 siblings, 0 replies; 2+ messages in thread
From: Tu, Lijuan @ 2020-02-10 9:04 UTC (permalink / raw)
To: Xiao, QimaiX, dts; +Cc: Xiao, QimaiX
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 <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1
>
> update iavf path for dpdk20.02_rc1
>
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-10 9:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 5:20 [dts] [PATCH V1]tests/iavf: update iavf path for dpdk20.02_rc1 Xiao Qimai
2020-02-10 9:04 ` Tu, Lijuan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).