diff mbox series

[02/38] tests-TestSuite_dpdk_gso_lib.py:support meson build

Message ID 1599207525-22123-2-git-send-email-xix.zhang@intel.com (mailing list archive)
State Accepted
Headers
Series Modify suite to support meson & makefile |

Commit Message

Zhang, XiX Sept. 4, 2020, 8:18 a.m. UTC 
  Signed-off-by: xizhan4x <xix.zhang@intel.com>
---
 tests/TestSuite_dpdk_gso_lib.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/tests/TestSuite_dpdk_gso_lib.py b/tests/TestSuite_dpdk_gso_lib.py
index 433869a..722a7c9 100644
--- a/tests/TestSuite_dpdk_gso_lib.py
+++ b/tests/TestSuite_dpdk_gso_lib.py
@@ -70,6 +70,8 @@  class TestDPDKGsoLib(TestCase):
                     'Pls config the direct connection info in vhost_peer_conf.cfg')
         bind_script_path = self.dut.get_dpdk_bind_script()
         self.dut.send_expect('%s --bind=%s %s' % (bind_script_path, self.def_driver, self.pci), '# ')
+        self.path=self.dut.apps_name['test-pmd']
+        self.testpmd_name=self.path.split("/")[-1]
 
         # get the numa info about the pci info which config in peer cfg
         bus = int(self.pci[5:7], base=16)
@@ -103,7 +105,7 @@  class TestDPDKGsoLib(TestCase):
         # Run before each test case.
         # Clean the execution ENV
         self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
-        self.dut.send_expect("killall -s INT testpmd", "#")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
 
     def launch_testpmd_gso_on(self, mode=0):
@@ -113,7 +115,7 @@  class TestDPDKGsoLib(TestCase):
         # mode = 3: TSO
         # mode = others: NO DPDK GSO/TSO
         eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=['net_vhost0,iface=%s/vhost-net,queues=1' % self.base_dir])
-        self.testcmd_start = self.target + "/app/testpmd " + eal_param + " -- -i --tx-offloads=0x00 --txd=1024 --rxd=1024"
+        self.testcmd_start = self.path + eal_param + " -- -i --tx-offloads=0x00 --txd=1024 --rxd=1024"
         self.vhost_user = self.dut.new_session(suite="user")
         self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
         self.vhost_user.send_expect("set fwd csum", "testpmd> ", 120)
@@ -521,7 +523,7 @@  class TestDPDKGsoLib(TestCase):
         """
         Run after each test case.
         """
-        self.dut.send_expect("killall -s INT testpmd", "#")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
         self.dut.send_expect(
             "./usertools/dpdk-devbind.py -u %s" % (self.peer_pci), '# ', 30)