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

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


Change the relative path to an absolute path.

Signed-off-by: zhu,shuai <shuaix.zhu at intel.com>
---
 tests/TestSuite_vhost_virtio_user_interrupt.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
index 5422e04..e4048ca 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -62,6 +62,7 @@ class TestVirtioUserInterrupt(TestCase):
         self.prepare_l3fwd_power()
         self.tx_port = self.tester.get_local_port(self.dut_ports[0])
         self.tx_interface = self.tester.get_interface(self.tx_port)
+        self.base_dir = self.dut.base_dir.replace('~', '/root')
 
     def set_up(self):
         """
@@ -69,7 +70,7 @@ class TestVirtioUserInterrupt(TestCase):
         """
         self.dut.send_expect("killall -s INT testpmd", "#")
         self.dut.send_expect("killall -s INT l3fwd-power", "#")
-        self.dut.send_expect("rm -rf vhost-net*", "#")
+        self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
 
         self.l3fwd = self.dut.new_session(suite="l3fwd")
         self.vhost = self.dut.new_session(suite="vhost")
@@ -115,10 +116,10 @@ class TestVirtioUserInterrupt(TestCase):
         cmd_vhost_user = self.dut.target + "/app/testpmd -n %d -c %s " + \
               "--socket-mem 1024,1024 --legacy-mem %s " + \
               "--file-prefix=vhost " + \
-              "--vdev 'net_vhost0,iface=vhost-net,queues=1,client=0' " + \
+              "--vdev 'net_vhost0,iface=%s/vhost-net,queues=1,client=0' " + \
               "-- -i --rxq=1 --txq=1"
         cmd_vhost_user = cmd_vhost_user % (self.mem_channel,
-                self.core_mask_vhost, pci)
+                self.core_mask_vhost, pci, self.base_dir)
 
         self.vhost.send_expect(cmd_vhost_user, "testpmd>", 30)
         self.vhost.send_expect("set fwd mac", "testpmd>", 30)
@@ -131,10 +132,10 @@ class TestVirtioUserInterrupt(TestCase):
         cmd_virtio_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" + \
+                        " --vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=%s/vhost-net" + \
                         " -- -i --txd=512 --rxd=128 --tx-offloads=0x00"
         cmd_virtio_user = cmd_virtio_user % (self.mem_channel,
-                        self.core_mask_virtio)
+                        self.core_mask_virtio, self.base_dir)
 
         self.virtio.send_expect(cmd_virtio_user, "testpmd>", 120)
         self.virtio.send_expect("set fwd mac", "testpmd>", 20)
@@ -185,7 +186,7 @@ class TestVirtioUserInterrupt(TestCase):
         Check the virtio-user interrupt can work when use vhost-user as backend
         """
         self.start_vhost_testpmd(pci="")
-        self.launch_l3fwd(path="./vhost-net")
+        self.launch_l3fwd(path="%s/vhost-net" % self.base_dir)
         # double check the status of interrupt core
         for i in range(2):
             self.tester.scapy_append('pk=[Ether(dst="52:54:00:00:00:01")/IP()/("X"*64)]')
-- 
2.17.2



More information about the dts mailing list