[dts] [PATCH V1 02/15] tests/loopback_virtio_user_server_mode:Change the relative path to an absolute path.

zhu,shuai shuaix.zhu at intel.com
Thu Aug 29 09:16:42 CEST 2019


Change the relative path to an absolute path.

Signed-off-by: zhu,shuai <shuaix.zhu at intel.com>
---
 .../TestSuite_loopback_virtio_user_server_mode.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/TestSuite_loopback_virtio_user_server_mode.py b/tests/TestSuite_loopback_virtio_user_server_mode.py
index fd4b807..08278df 100644
--- a/tests/TestSuite_loopback_virtio_user_server_mode.py
+++ b/tests/TestSuite_loopback_virtio_user_server_mode.py
@@ -59,13 +59,14 @@ class TestLoopbackVirtioUserServerMode(TestCase):
         self.core_list_host = self.core_list[3:6]
         self.core_mask_user = utils.create_mask(self.core_list_user)
         self.core_mask_host = utils.create_mask(self.core_list_host)
+        self.base_dir = self.dut.base_dir.replace('~', '/root')
 
     def set_up(self):
         """
         Run before each test case.
         """
         # Clean the execution ENV
-        self.dut.send_expect("rm -rf ./vhost-net*", "#")
+        self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
         self.dut.send_expect("killall -s INT testpmd", "#")
         # Prepare the result table
         self.table_header = ["Mode", "Pkt_size", "Throughput(Mpps)",
@@ -82,10 +83,10 @@ class TestLoopbackVirtioUserServerMode(TestCase):
         command_client = self.dut.target + "/app/testpmd " + \
                          " -n %d -c %s --socket-mem 1024,1024 " + \
                          " --legacy-mem --no-pci --file-prefix=vhost " + \
-                         " --vdev 'net_vhost0,iface=vhost-net,client=1,queues=%d' " + \
+                         " --vdev 'net_vhost0,iface=%s/vhost-net,client=1,queues=%d' " + \
                          " -- -i --rxq=%d --txq=%d --nb-cores=%d %s"
         command_line_client = command_client % (self.dut.get_memory_channels(),
-                              self.core_mask_host, queue_number, queue_number,
+                              self.core_mask_host, self.base_dir, queue_number, queue_number,
                               queue_number, nb_cores, extern_params)
         self.vhost.send_expect(command_line_client, "testpmd> ", 120)
         self.vhost.send_expect("set fwd mac", "testpmd> ", 120)
@@ -96,10 +97,10 @@ class TestLoopbackVirtioUserServerMode(TestCase):
         """
         command_line_user = self.dut.target + "/app/testpmd -n %d -c %s --socket-mem 1024,1024 " + \
                             "--legacy-mem --no-pci --file-prefix=virtio " + \
-                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=vhost-net,server=1,queues=1 " + \
+                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net,server=1,queues=1 " + \
                             " -- -i --rxq=1 --txq=1 --no-numa"
         command_line_user = command_line_user % (self.dut.get_memory_channels(),
-                            self.core_mask_user)
+                            self.core_mask_user, self.base_dir)
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120)
 
@@ -115,10 +116,10 @@ class TestLoopbackVirtioUserServerMode(TestCase):
         """
         command_line_user = self.dut.target + "/app/testpmd -n %d -c %s --socket-mem 1024,1024 " + \
                             "--legacy-mem --no-pci --file-prefix=virtio " + \
-                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=vhost-net,server=1,queues=%d,%s " + \
+                            "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net,server=1,queues=%d,%s " + \
                             " -- -i %s --nb-cores=%d --rxq=%d --txq=%d"
         command_line_user = command_line_user % (self.dut.get_memory_channels(),
-                            self.core_mask_user, self.queue_number, mode, extern_params,
+                            self.core_mask_user, self.base_dir, self.queue_number, mode, extern_params,
                             self.nb_cores, self.queue_number, self.queue_number)
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120)
-- 
2.17.2



More information about the dts mailing list