[V1,2/2] tests/TestSuite_vm2vm_virtio_user: Adapt RTE_LIBRTE_PMD_PCAP updates
diff mbox series

Message ID 20201023154828.1274699-3-yux.jiang@intel.com
State Superseded
Headers show
Series
  • [V1,1/2] tests/TestSuite_vm2vm_virtio_pmd: Adapt RTE_LIBRTE_PMD_PCAP updates
Related show

Commit Message

Jiang, YuX Oct. 23, 2020, 3:48 p.m. UTC
From: JiangYu <yux.jiang@intel.com>

For DPDK commit: b0b672aea, PMD_PCAP has been defined by default, should not redefine.

Signed-off-by: JiangYu <yux.jiang@intel.com>
---
 tests/TestSuite_vm2vm_virtio_user.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Ma, LihongX Oct. 29, 2020, 8:10 a.m. UTC | #1
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of JiangYuX
> Sent: Friday, October 23, 2020 11:48 PM
> To: dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts] [PATCH V1 2/2] tests/TestSuite_vm2vm_virtio_user: Adapt
> RTE_LIBRTE_PMD_PCAP updates
> 
> From: JiangYu <yux.jiang@intel.com>
> 
> For DPDK commit: b0b672aea, PMD_PCAP has been defined by default, should
> not redefine.
> 
> Signed-off-by: JiangYu <yux.jiang@intel.com>
> ---
>  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):
>          """
> --
> 2.7.4

As now makefile have been remove from dpdk, I think you can delete them directly.

Regards,
Ma,lihong

Patch
diff mbox series

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):
         """