diff mbox series

[V1] tests/TestSuite_pvp_share_lib:support meson build

Message ID 20201030135630.23673-1-weix.ling@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] tests/TestSuite_pvp_share_lib:support meson build |

Commit Message

Ling, WeiX Oct. 30, 2020, 1:56 p.m. UTC 
  remove makefile build type, and support meson build. 

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_pvp_share_lib.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

Comments

Ling, WeiX Oct. 30, 2020, 6:01 a.m. UTC | #1 
Tested-by: Ling, Wei <weix.ling@intel.com>

Regards,
Ling Wei

> -----Original Message-----
> From: lingwei <weix.ling@intel.com>
> Sent: Friday, October 30, 2020 09:57 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V1] tests/TestSuite_pvp_share_lib:support meson
> build
Ma, LihongX Oct. 30, 2020, 8:45 a.m. UTC | #2 
Acked-by: Lihong Ma<lihongx.ma@intel.com>

Regards,
Ma,lihong

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of lingwei
> Sent: Friday, October 30, 2020 9:57 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts] [PATCH V1] tests/TestSuite_pvp_share_lib:support meson build
> 
> remove makefile build type, and support meson build.
> 
> Signed-off-by: lingwei <weix.ling@intel.com>
> ---
Tu, Lijuan Nov. 3, 2020, 2:17 a.m. UTC | #3 
> > remove makefile build type, and support meson build.
> >
> > Signed-off-by: lingwei <weix.ling@intel.com>
> Acked-by: Lihong Ma<lihongx.ma@intel.com>

Applied
diff mbox series

Patch

diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py
index 50986c1..6746ff8 100644
--- a/tests/TestSuite_pvp_share_lib.py
+++ b/tests/TestSuite_pvp_share_lib.py
@@ -79,16 +79,8 @@  class TestPVPShareLib(TestCase):
         self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
         self.vhost_user = self.dut.new_session(suite="vhost-user")
         self.virtio_user = self.dut.new_session(suite="virtio-user")
-        if self.dut.build_type == 'meson':
-            self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" %
-                        (self.dut.base_dir, self.dut.target), "# ")
-            self.virtio_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" %
-                        (self.dut.base_dir, self.dut.target), "# ")
-        else:
-            self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/lib:$LD_LIBRARY_PATH" %
-                        (self.dut.base_dir, self.dut.target), "# ")
-            self.virtio_user.send_expect("export LD_LIBRARY_PATH=%s/%s/lib:$LD_LIBRARY_PATH" %
-                        (self.dut.base_dir, self.dut.target), "# ")
+        self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" %(self.dut.base_dir, self.dut.target), "# ")
+        self.virtio_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" %(self.dut.base_dir, self.dut.target), "# ")
         # Prepare the result table
         self.table_header = ['Frame']
         self.table_header.append("Mode")
@@ -98,13 +90,11 @@  class TestPVPShareLib(TestCase):
         self.result_table_create(self.table_header)
 
     def prepare_share_lib_env(self):
-        self.dut.send_expect("sed -i 's/CONFIG_RTE_BUILD_SHARED_LIB=n$/CONFIG_RTE_BUILD_SHARED_LIB=y/' config/common_base", "# ")
-        self.dut.set_build_options({"RTE_BUILD_SHARED_LIB" : "y"})
+        self.dut.set_build_options({"RTE_BUILD_SHARED_LIB": "y"})
         self.dut.build_install_dpdk(self.dut.target)
 
     def restore_env(self):
-        self.dut.send_expect("sed -i 's/CONFIG_RTE_BUILD_SHARED_LIB=y$/CONFIG_RTE_BUILD_SHARED_LIB=n/' config/common_base", "# ")
-        self.dut.set_build_options({"RTE_BUILD_SHARED_LIB" : "n"})
+        self.dut.set_build_options({"RTE_BUILD_SHARED_LIB": "n"})
         self.dut.build_install_dpdk(self.dut.target)
 
     def send_and_verify(self):
@@ -146,9 +136,10 @@  class TestPVPShareLib(TestCase):
         """
         start testpmd on vhost
         """
+        self.pci_info = self.dut.ports_info[0]['pci']
         eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_vhost_user, prefix='vhost',
-                                                   vdevs=['net_vhost0,iface=vhost-net,queues=1'])
-        eal_param += " -d librte_pmd_vhost.so -d librte_pmd_%s.so -d librte_mempool_ring.so --file-prefix=vhost" % driver
+                                                   vdevs=['net_vhost0,iface=vhost-net,queues=1'], ports=[self.pci_info])
+        eal_param += " -d librte_net_vhost.so -d librte_net_%s.so -d librte_mempool_ring.so --file-prefix=vhost" % driver
         command_line_client = self.path + eal_param + ' -- -i'
 
         self.vhost_user.send_expect(command_line_client, "testpmd> ", 120)
@@ -164,7 +155,7 @@  class TestPVPShareLib(TestCase):
                 'net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net'])
         if self.check_2M_env:
             eal_param += " --single-file-segments"
-        eal_param += " -d librte_pmd_virtio.so -d librte_mempool_ring.so"
+        eal_param += " -d librte_net_virtio.so -d librte_mempool_ring.so"
         command_line_user = self.path + eal_param + " -- -i"
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("start", "testpmd> ", 120)