* [dts] [PATCH V1 1/7] tests/TestSuite_vm2vm_virtio_pmd: support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
@ 2020-09-18 5:26 ` Jiang, YuX
2020-09-18 5:26 ` [dts] [dst] [PATCH V1 2/7] tests/TestSuite_virtio_user_as_exceptional_path: " Jiang, YuX
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jiang, YuX @ 2020-09-18 5:26 UTC (permalink / raw)
To: dts; +Cc: JiangYu
From: JiangYu <yux.jiang@intel.com>
Adapt testpmd_name
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_vm2vm_virtio_pmd.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/TestSuite_vm2vm_virtio_pmd.py b/tests/TestSuite_vm2vm_virtio_pmd.py
index 5adeb2f..a5c4032 100644
--- a/tests/TestSuite_vm2vm_virtio_pmd.py
+++ b/tests/TestSuite_vm2vm_virtio_pmd.py
@@ -61,6 +61,7 @@ class TestVM2VMVirtioPMD(TestCase):
self.pci_info = self.dut.ports_info[0]['pci']
self.app_testpmd_path = self.dut.apps_name['test-pmd']
self.app_pdump = self.dut.apps_name['pdump']
+ self.testpmd_name = self.app_testpmd_path.split("/")[-1]
def set_up(self):
"""
@@ -69,7 +70,7 @@ class TestVM2VMVirtioPMD(TestCase):
self.table_header = ["FrameSize(B)", "Mode",
"Throughput(Mpps)", "Queue Number", "Path"]
self.result_table_create(self.table_header)
- 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("rm -rf %s/vhost-net*" % self.base_dir, "#")
self.vm_dut = []
--
2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [dts] [dst] [PATCH V1 2/7] tests/TestSuite_virtio_user_as_exceptional_path: support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
2020-09-18 5:26 ` [dts] [PATCH V1 1/7] tests/TestSuite_vm2vm_virtio_pmd: " Jiang, YuX
@ 2020-09-18 5:26 ` Jiang, YuX
2020-09-18 5:26 ` [dts] [PATCH V1 3/7] tests/TestSuite_vhost_virtio_user_interrupt: " Jiang, YuX
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jiang, YuX @ 2020-09-18 5:26 UTC (permalink / raw)
To: dts; +Cc: JiangYu
From: JiangYu <yux.jiang@intel.com>
Adapt testpmd_name
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_virtio_user_as_exceptional_path.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_virtio_user_as_exceptional_path.py b/tests/TestSuite_virtio_user_as_exceptional_path.py
index 3c04f55..3d54441 100644
--- a/tests/TestSuite_virtio_user_as_exceptional_path.py
+++ b/tests/TestSuite_virtio_user_as_exceptional_path.py
@@ -70,6 +70,7 @@ class TestVirtioUserAsExceptionalPath(TestCase):
self.peer_pci_setup = False
self.prepare_dpdk()
self.app_testpmd_path = self.dut.apps_name['test-pmd']
+ self.testpmd_name = self.app_testpmd_path.split("/")[-1]
def set_up(self):
#
@@ -77,7 +78,7 @@ class TestVirtioUserAsExceptionalPath(TestCase):
#
# Clean the execution ENV
self.dut.send_expect("rm -rf ./vhost-net*", "#")
- 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("modprobe vhost-net", "#")
self.peer_pci_setup = False
@@ -316,7 +317,7 @@ class TestVirtioUserAsExceptionalPath(TestCase):
#
self.dut.kill_all()
self.dut.close_session(self.vhost_user)
- 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("rm -rf ./vhost-net", "#")
time.sleep(2)
--
2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [dts] [PATCH V1 3/7] tests/TestSuite_vhost_virtio_user_interrupt: support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
2020-09-18 5:26 ` [dts] [PATCH V1 1/7] tests/TestSuite_vm2vm_virtio_pmd: " Jiang, YuX
2020-09-18 5:26 ` [dts] [dst] [PATCH V1 2/7] tests/TestSuite_virtio_user_as_exceptional_path: " Jiang, YuX
@ 2020-09-18 5:26 ` Jiang, YuX
2020-09-18 5:26 ` [dts] [PATCH V1 4/7] tests/TestSuite_vdev_primary_secondary: " Jiang, YuX
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jiang, YuX @ 2020-09-18 5:26 UTC (permalink / raw)
To: dts; +Cc: JiangYu
From: JiangYu <yux.jiang@intel.com>
Adapt testpmd_name and l3fwdpower_name
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_vhost_virtio_user_interrupt.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
index 118fb8e..ae75da5 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -64,13 +64,15 @@ class TestVirtioUserInterrupt(TestCase):
self.tx_interface = self.tester.get_interface(self.tx_port)
self.app_l3fwd_power_path = self.dut.apps_name['l3fwd-power']
self.app_testpmd_path = self.dut.apps_name['test-pmd']
+ self.testpmd_name = self.app_testpmd_path.split("/")[-1]
+ self.l3fwdpower_name = self.app_l3fwd_power_path.split("/")[-1]
def set_up(self):
"""
run before each test case.
"""
- self.dut.send_expect("killall -s INT testpmd", "#")
- self.dut.send_expect("killall l3fwd-power", "#")
+ self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
+ self.dut.send_expect("killall %s" % self.l3fwdpower_name, "#")
self.dut.send_expect("rm -rf vhost-net*", "#")
self.l3fwd = self.dut.new_session(suite="l3fwd")
@@ -259,8 +261,8 @@ class TestVirtioUserInterrupt(TestCase):
"""
run after each test case.
"""
- self.dut.send_expect("killall l3fwd-power", "#")
- self.dut.send_expect("killall -s INT testpmd", "#")
+ self.dut.send_expect("killall %s" % self.l3fwdpower_name, "#")
+ self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
self.close_all_session()
def tear_down_all(self):
--
2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [dts] [PATCH V1 4/7] tests/TestSuite_vdev_primary_secondary: support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
` (2 preceding siblings ...)
2020-09-18 5:26 ` [dts] [PATCH V1 3/7] tests/TestSuite_vhost_virtio_user_interrupt: " Jiang, YuX
@ 2020-09-18 5:26 ` Jiang, YuX
2020-09-18 5:26 ` [dts] [PATCH V1 5/7] tests/TestSuite_loopback_virtio_user_server_mode: " Jiang, YuX
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jiang, YuX @ 2020-09-18 5:26 UTC (permalink / raw)
To: dts; +Cc: JiangYu
From: JiangYu <yux.jiang@intel.com>
Adapt testpmd_name
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_vdev_primary_secondary.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_vdev_primary_secondary.py b/tests/TestSuite_vdev_primary_secondary.py
index 0919c1f..50d5b59 100644
--- a/tests/TestSuite_vdev_primary_secondary.py
+++ b/tests/TestSuite_vdev_primary_secondary.py
@@ -66,13 +66,14 @@ class TestVdevPrimarySecondary(TestCase):
self.pci_info = self.dut.ports_info[0]['pci']
self.app_testpmd_path = self.dut.apps_name['test-pmd']
self.app_symmetric_mp_path = self.dut.apps_name['symmetric_mp']
+ self.testpmd_name = self.app_testpmd_path.split("/")[-1]
def set_up(self):
"""
Run before each test case.
"""
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", "#")
@@ -178,7 +179,7 @@ class TestVdevPrimarySecondary(TestCase):
self.vm_dut.kill_all()
self.dut.kill_all()
self.vm.stop()
- 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", "#")
time.sleep(2)
--
2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [dts] [PATCH V1 5/7] tests/TestSuite_loopback_virtio_user_server_mode: support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
` (3 preceding siblings ...)
2020-09-18 5:26 ` [dts] [PATCH V1 4/7] tests/TestSuite_vdev_primary_secondary: " Jiang, YuX
@ 2020-09-18 5:26 ` Jiang, YuX
2020-09-18 5:26 ` [dts] [PATCH V1 6/7] tests/TestSuite_loopback_multi_queues: " Jiang, YuX
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jiang, YuX @ 2020-09-18 5:26 UTC (permalink / raw)
To: dts; +Cc: JiangYu
From: JiangYu <yux.jiang@intel.com>
Adapt testpmd_name
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_loopback_virtio_user_server_mode.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_loopback_virtio_user_server_mode.py b/tests/TestSuite_loopback_virtio_user_server_mode.py
index 9503208..cb1dc2b 100644
--- a/tests/TestSuite_loopback_virtio_user_server_mode.py
+++ b/tests/TestSuite_loopback_virtio_user_server_mode.py
@@ -58,6 +58,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):
self.core_list_user = self.core_list[0:3]
self.core_list_host = self.core_list[3:6]
self.path=self.dut.apps_name['test-pmd']
+ self.testpmd_name = self.path.split("/")[-1]
def set_up(self):
"""
@@ -65,7 +66,7 @@ class TestLoopbackVirtioUserServerMode(TestCase):
"""
# Clean the execution ENV
self.dut.send_expect("rm -rf ./vhost-net*", "#")
- self.dut.send_expect("killall -s INT testpmd", "#")
+ self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
# Prepare the result table
self.table_header = ["Mode", "Pkt_size", "Throughput(Mpps)",
"Queue Number", "Cycle"]
@@ -616,7 +617,7 @@ class TestLoopbackVirtioUserServerMode(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.close_all_session()
time.sleep(2)
--
2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [dts] [PATCH V1 6/7] tests/TestSuite_loopback_multi_queues: support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
` (4 preceding siblings ...)
2020-09-18 5:26 ` [dts] [PATCH V1 5/7] tests/TestSuite_loopback_virtio_user_server_mode: " Jiang, YuX
@ 2020-09-18 5:26 ` Jiang, YuX
2020-09-18 5:26 ` [dts] [PATCH V1 7/7] tests/TestSuite_loopback_multi_paths_port_restart: " Jiang, YuX
2020-09-23 8:39 ` [dts] [PATCH V1 0/7] Modify virito func suites to " Tu, Lijuan
7 siblings, 0 replies; 10+ messages in thread
From: Jiang, YuX @ 2020-09-18 5:26 UTC (permalink / raw)
To: dts; +Cc: JiangYu
From: JiangYu <yux.jiang@intel.com>
Adapt testpmd_name
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_loopback_multi_queues.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_loopback_multi_queues.py b/tests/TestSuite_loopback_multi_queues.py
index 0fdadeb..86c2ce9 100644
--- a/tests/TestSuite_loopback_multi_queues.py
+++ b/tests/TestSuite_loopback_multi_queues.py
@@ -60,6 +60,7 @@ class TestLoopbackMultiQueues(TestCase):
if 'packet_sizes' in self.get_suite_cfg():
self.frame_sizes = self.get_suite_cfg()['packet_sizes']
self.path=self.dut.apps_name['test-pmd']
+ self.testpmd_name = self.path.split("/")[-1]
def set_up(self):
"""
@@ -67,7 +68,7 @@ class TestLoopbackMultiQueues(TestCase):
"""
# Prepare the result table
self.dut.send_expect("rm -rf ./vhost-net*", "#")
- self.dut.send_expect("killall -s INT testpmd", "#")
+ self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
self.table_header = ["Frame", "Mode", "Throughput(Mpps)", "Queue Number"]
self.result_table_create(self.table_header)
self.data_verify = {}
@@ -380,7 +381,7 @@ class TestLoopbackMultiQueues(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.close_all_session()
def tear_down_all(self):
--
2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [dts] [PATCH V1 7/7] tests/TestSuite_loopback_multi_paths_port_restart: support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
` (5 preceding siblings ...)
2020-09-18 5:26 ` [dts] [PATCH V1 6/7] tests/TestSuite_loopback_multi_queues: " Jiang, YuX
@ 2020-09-18 5:26 ` Jiang, YuX
2020-09-22 8:05 ` Ma, LihongX
2020-09-23 8:39 ` [dts] [PATCH V1 0/7] Modify virito func suites to " Tu, Lijuan
7 siblings, 1 reply; 10+ messages in thread
From: Jiang, YuX @ 2020-09-18 5:26 UTC (permalink / raw)
To: dts; +Cc: JiangYu
From: JiangYu <yux.jiang@intel.com>
Adapt testpmd_name
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
tests/TestSuite_loopback_multi_paths_port_restart.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/TestSuite_loopback_multi_paths_port_restart.py b/tests/TestSuite_loopback_multi_paths_port_restart.py
index 7a1448d..54c9756 100644
--- a/tests/TestSuite_loopback_multi_paths_port_restart.py
+++ b/tests/TestSuite_loopback_multi_paths_port_restart.py
@@ -58,6 +58,7 @@ class TestLoopbackPortRestart(TestCase):
self.core_list_user = self.core_list[0:2]
self.core_list_host = self.core_list[2:5]
self.path=self.dut.apps_name['test-pmd']
+ self.testpmd_name = self.path.split("/")[-1]
def set_up(self):
"""
@@ -65,7 +66,7 @@ class TestLoopbackPortRestart(TestCase):
"""
# Clean the execution ENV
self.dut.send_expect("rm -rf ./vhost.out", "#")
- 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", "#")
# Prepare the result table
self.table_header = ["FrameSize(B)", "Mode", "Throughput(Mpps)", "Cycle"]
@@ -78,7 +79,7 @@ class TestLoopbackPortRestart(TestCase):
"""
start testpmd on vhost
"""
- self.dut.send_expect("killall -s INT testpmd", "#")
+ self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
self.dut.send_expect("rm -rf ./vhost-net*", "#")
eal_param = self.dut.create_eal_parameters(cores=self.core_list_host, prefix='vhost', no_pci=True, vdevs=['net_vhost0,iface=vhost-net,queues=1,client=0'])
command_line_client = self.path + eal_param + " -- -i --nb-cores=1 --txd=1024 --rxd=1024"
@@ -330,7 +331,7 @@ class TestLoopbackPortRestart(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.close_all_session()
time.sleep(2)
--
2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [dts] [PATCH V1 7/7] tests/TestSuite_loopback_multi_paths_port_restart: support meson build
2020-09-18 5:26 ` [dts] [PATCH V1 7/7] tests/TestSuite_loopback_multi_paths_port_restart: " Jiang, YuX
@ 2020-09-22 8:05 ` Ma, LihongX
0 siblings, 0 replies; 10+ messages in thread
From: Ma, LihongX @ 2020-09-22 8:05 UTC (permalink / raw)
To: Jiang, YuX, dts; +Cc: Jiang, YuX
Acked-by: lihongx Ma<lihongx.ma@intel.com>
Regards,
Ma,lihong
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Jiang, YuX
> Sent: Friday, September 18, 2020 1:26 PM
> To: dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts] [PATCH V1 7/7]
> tests/TestSuite_loopback_multi_paths_port_restart: support meson build
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dts] [PATCH V1 0/7] Modify virito func suites to support meson build
2020-09-18 5:26 [dts] [PATCH V1 0/7] Modify virito func suites to support meson build Jiang, YuX
` (6 preceding siblings ...)
2020-09-18 5:26 ` [dts] [PATCH V1 7/7] tests/TestSuite_loopback_multi_paths_port_restart: " Jiang, YuX
@ 2020-09-23 8:39 ` Tu, Lijuan
7 siblings, 0 replies; 10+ messages in thread
From: Tu, Lijuan @ 2020-09-23 8:39 UTC (permalink / raw)
To: Jiang, YuX, dts; +Cc: Jiang, YuX
Applied the series.
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Jiang, YuX
> Sent: 2020年9月18日 13:26
> To: dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts] [PATCH V1 0/7] Modify virito func suites to support meson build
>
> From: JiangYu <yux.jiang@intel.com>
>
> Adapt testpmd_name and l3fwdpower_name for kill progress
>
> JiangYu (7):
> tests/TestSuite_vm2vm_virtio_pmd: support meson build
> tests/TestSuite_virtio_user_as_exceptional_path: support meson build
> tests/TestSuite_vhost_virtio_user_interrupt: support meson build
> tests/TestSuite_vdev_primary_secondary: support meson build
> tests/TestSuite_loopback_virtio_user_server_mode: support meson build
> tests/TestSuite_loopback_multi_queues: support meson build
> tests/TestSuite_loopback_multi_paths_port_restart: support meson build
>
> tests/TestSuite_loopback_multi_paths_port_restart.py | 7 ++++---
> tests/TestSuite_loopback_multi_queues.py | 5 +++--
> tests/TestSuite_loopback_virtio_user_server_mode.py | 5 +++--
> tests/TestSuite_vdev_primary_secondary.py | 5 +++--
> tests/TestSuite_vhost_virtio_user_interrupt.py | 10 ++++++----
> tests/TestSuite_virtio_user_as_exceptional_path.py | 5 +++--
> tests/TestSuite_vm2vm_virtio_pmd.py | 3 ++-
> 7 files changed, 24 insertions(+), 16 deletions(-)
>
> --
> 2.7.4
^ permalink raw reply [flat|nested] 10+ messages in thread