[V1] tests/vhost_user_live_migration: Adapt meson build

Message ID 20201112141925.1932346-1-yux.jiang@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] tests/vhost_user_live_migration: Adapt meson build |

Commit Message

Yu Jiang Nov. 12, 2020, 2:19 p.m. UTC
  From: JiangYu <yux.jiang@intel.com>

Config app_path to adapt meson build

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

Comments

Yu Jiang Nov. 12, 2020, 6:22 a.m. UTC | #1
Tested-by: JiangYuX <yux.jiang@intel.com>

    Best Regards
    Jiang yu


> -----Original Message-----
> From: JiangYuX [mailto:yux.jiang@intel.com]
> Sent: Thursday, November 12, 2020 10:19 PM
> To: dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts] [PATCH V1] tests/vhost_user_live_migration: Adapt meson
> build
  
Tu, Lijuan Nov. 18, 2020, 3:23 a.m. UTC | #2
> Config app_path to adapt meson build
> 
> Signed-off-by: JiangYu <yux.jiang@intel.com>

Applied
  

Patch

diff --git a/tests/TestSuite_vhost_user_live_migration.py b/tests/TestSuite_vhost_user_live_migration.py
index 351b9e6..915fa59 100644
--- a/tests/TestSuite_vhost_user_live_migration.py
+++ b/tests/TestSuite_vhost_user_live_migration.py
@@ -84,6 +84,8 @@  class TestVhostUserLiveMigration(TestCase):
         backup_socket_num = len(set([int(core['socket']) for core in self.backup_dut.cores]))
         self.host_socket_mem = ','.join(['1024']*host_socket_num)
         self.backup_socket_mem = ','.join(['1024']*backup_socket_num)
+        self.testpmd_path=self.dut.apps_name['test-pmd']
+        self.testpmd_name = self.testpmd_path.split("/")[-1]
 
     def set_up(self):
         self.host_dut.send_expect('rm ./vhost-net*', '# ', 30)
@@ -148,7 +150,7 @@  class TestVhostUserLiveMigration(TestCase):
         zero_copy_str = ''
         if zero_copy is True:
             zero_copy_str = ',dequeue-zero-copy=1'
-        testcmd = self.dut.target + "/app/testpmd "
+        testcmd = self.testpmd_path + " "
         vdev = ['eth_vhost0,iface=%s/vhost-net,queues=%d%s' % (self.base_dir, self.queue_number, zero_copy_str)]
         para = " -- -i --nb-cores=%d --rxq=%d --txq=%d" % (self.queue_number, self.queue_number, self.queue_number)
         eal_params_first = self.dut.create_eal_parameters(cores=self.core_list0, prefix='vhost', ports=[self.host_pci_info], vdevs=vdev)
@@ -280,7 +282,7 @@  class TestVhostUserLiveMigration(TestCase):
         vm_dut.send_expect('export TERM=screen', '# ')
         vm_dut.send_expect('screen -S %s' % self.screen_name, '# ', 120)
 
-        vm_testpmd = self.target + '/app/testpmd -c 0x3 -n 4 -- -i'
+        vm_testpmd = self.testpmd_path + ' -c 0x3 -n 4 -- -i'
         vm_dut.send_expect(vm_testpmd, 'testpmd> ', 120)
         vm_dut.send_expect('set fwd rxonly', 'testpmd> ', 30)
         vm_dut.send_expect('set promisc all off', 'testpmd> ', 30)