[dts] [PATCH V1 10/17] tests/pvp_vhost_user_built_in_net_driver:vhost-net changed to absolute path

zhuwenhui wenhuix.zhu at intel.com
Thu Aug 29 10:03:49 CEST 2019


Vhost-net changed to absolute path

Signed-off-by: zhuwenhui <wenhuix.zhu at intel.com>
---
 tests/TestSuite_pvp_vhost_user_built_in_net_driver.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
index 52d9df9..6c65b7e 100644
--- a/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
+++ b/tests/TestSuite_pvp_vhost_user_built_in_net_driver.py
@@ -78,12 +78,13 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
             self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
         # create an instance to set stream field setting
         self.pktgen_helper = PacketGeneratorHelper()
+        self.base_dir = self.dut.base_dir.replace('~', '/root')
 
     def set_up(self):
         """
         Run before each test case.
         """
-        self.dut.send_expect("rm -rf ./vhost-net*", "# ")
+        self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "# ")
         self.dut.send_expect("rm -rf ./vhost.out", "# ")
         self.dut.send_expect("killall -s INT vhost", "# ")
         self.dut.send_expect("killall -s INT testpmd", "# ")
@@ -160,10 +161,10 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
         command_line_client = "./examples/vhost/build/app/vhost-switch " + \
                               "-c %s -n %d --socket-mem 2048,2048 -- " + \
                               "-p 0x1 --mergeable 0 --vm2vm 1 " + \
-                              "--builtin-net-driver  --socket-file ./vhost-net" + \
+                              "--builtin-net-driver  --socket-file %s/vhost-net" + \
                               "> ./vhost.out &"
         command_line_client = command_line_client % (self.core_mask_vhost_user,
-                                            self.mem_channels)
+                                            self.mem_channels, self.base_dir)
         self.vhost_switch.send_expect(command_line_client, "# ", 120)
         time.sleep(15)
         try:
@@ -186,10 +187,10 @@ class TestPVPVhostUserBuiltInNetDriver(TestCase):
         """
         command_line_user = "./%s/app/testpmd -n %d -c %s " + \
                             "--no-pci --socket-mem 2048,2048 --file-prefix=virtio-user " + \
-                            "--vdev=net_virtio_user0,mac=%s,path=./vhost-net,queues=1 " + \
+                            "--vdev=net_virtio_user0,mac=%s,path=%s/vhost-net,queues=1 " + \
                             "-- -i --rxq=1 --txq=1"
         command_line_user = command_line_user % (self.target,
-            self.mem_channels, self.core_mask_virtio_user, self.virtio_mac)
+            self.mem_channels, self.core_mask_virtio_user, self.virtio_mac, self.base_dir)
         self.virtio_user.send_expect(command_line_user, "testpmd> ", 120)
         self.virtio_user.send_expect("set fwd mac", "testpmd> ", 120)
         self.virtio_user.send_expect("start tx_first", "testpmd> ", 120)
-- 
2.17.2



More information about the dts mailing list