test suite reviews and discussions
 help / color / Atom feed
* [dts] [PATCH V1 0/8] support meson build method
@ 2020-09-02  9:15 Xie wei
  2020-09-02  9:15 ` [dts] [dts 1/8] tests/TestSuite_flow_filtering:support " Xie wei
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

modify dts to support meson build method.

Xie wei (8):
  tests/TestSuite_flow_filtering:support meson build method
  tests/TestSuite_port_control:support meson build method
  tests/TestSuite_runtime_vf_queue_number:support meson build method
  tests/TestSuite_runtime_vf_queue_number_kernel:support meson build
    method
  tests/TestSuite_veb_switch:support meson build method
  tests/TestSuite_vf_interrupt_pmd:support meson build method
  tests/TestSuite_vm_power_manager:support meson build method
  tests/TestSuite_floating_veb:support meson build method

 tests/TestSuite_floating_veb.py               | 56 ++++++++++---------
 tests/TestSuite_flow_filtering.py             |  5 +-
 tests/TestSuite_port_control.py               |  3 +-
 tests/TestSuite_runtime_vf_queue_number.py    |  7 +--
 ...estSuite_runtime_vf_queue_number_kernel.py |  6 +-
 tests/TestSuite_veb_switch.py                 | 37 ++++++------
 tests/TestSuite_vf_interrupt_pmd.py           | 22 +++-----
 tests/TestSuite_vm_power_manager.py           | 31 ++++------
 8 files changed, 80 insertions(+), 87 deletions(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 1/8] tests/TestSuite_flow_filtering:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:15 ` [dts] [dts 2/8] tests/TestSuite_port_control:support " Xie wei
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_flow_filtering.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_flow_filtering.py b/tests/TestSuite_flow_filtering.py
index 079435d..4e3c544 100644
--- a/tests/TestSuite_flow_filtering.py
+++ b/tests/TestSuite_flow_filtering.py
@@ -51,14 +51,15 @@ class TestFlowFiltering(TestCase):
         self.txitf = self.tester.get_interface(self.tester.get_local_port(self.dut_ports[0]))
         # Verify that enough ports are available
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
-        out = self.dut.build_dpdk_apps("./examples/flow_filtering/")
+        out = self.dut.build_dpdk_apps("./examples/flow_filtering")
         self.verify('Error' not in out, "Compilation failed")
 
     def set_up(self):
         """
         Run before each test case.
         """
-        out = self.dut.send_command("./examples/flow_filtering/build/flow -l 1 -n 1", timeout=15)
+        cmd = self.dut.apps_name['flow_filtering'] + "-l 1 -n 1"
+        out = self.dut.send_command(cmd, timeout=15)
         self.verify("Error" not in out, "flow launch failed")
 
     def send_packet(self, pkg):
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 2/8] tests/TestSuite_port_control:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
  2020-09-02  9:15 ` [dts] [dts 1/8] tests/TestSuite_flow_filtering:support " Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:15 ` [dts] [dts 3/8] tests/TestSuite_runtime_vf_queue_number:support " Xie wei
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_port_control.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/TestSuite_port_control.py b/tests/TestSuite_port_control.py
index 147dc80..e8d96f5 100644
--- a/tests/TestSuite_port_control.py
+++ b/tests/TestSuite_port_control.py
@@ -158,7 +158,8 @@ class TestPortControl(TestCase):
         terminal.send_expect("ifconfig %s up" % vf_if[1], "#")
         terminal.send_expect("ip addr flush %s " % vf_if[1], "#")
         terminal.send_expect("./usertools/dpdk-devbind.py -b vfio-pci --force %s" % vf_pci[1], "#")
-        cmd = "./%s/app/testpmd -n 1 -w %s --vfio-intr=legacy -- -i" % (self.target, vf_pci[1])
+        app_name = terminal.apps_name['test-pmd']
+        cmd = app_name + "-n 1 -w %s --vfio-intr=legacy -- -i" % vf_pci[1]
         terminal.send_expect(cmd, "testpmd>", 10)
 
     def start_testpmd(self, terminal):
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 3/8] tests/TestSuite_runtime_vf_queue_number:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
  2020-09-02  9:15 ` [dts] [dts 1/8] tests/TestSuite_flow_filtering:support " Xie wei
  2020-09-02  9:15 ` [dts] [dts 2/8] tests/TestSuite_port_control:support " Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:15 ` [dts] [dts 4/8] tests/TestSuite_runtime_vf_queue_number_kernel:support " Xie wei
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_runtime_vf_queue_number.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_runtime_vf_queue_number.py b/tests/TestSuite_runtime_vf_queue_number.py
index 93caf9e..8d8a6f7 100644
--- a/tests/TestSuite_runtime_vf_queue_number.py
+++ b/tests/TestSuite_runtime_vf_queue_number.py
@@ -297,13 +297,12 @@ class TestRuntimeVfQn(TestCase):
         gest_eal_param = '-w %s --file-prefix=test2' % self.vm_dut_0.ports_info[0]['pci']
         self.vm0_testpmd = PmdOutput(self.vm_dut_0)
 
-        command_0 = "./%s/app/testpmd -c %s -n %d %s -- -i %s" \
-                  % (self.dut.target, '0xf', self.dut.get_memory_channels(), gest_eal_param, ' --rxq=0 --txq=0')
+        app_name = self.dut.apps_name['test-pmd']
+        command_0 = app_name + "-c %s -n %d %s -- -i %s" % ('0xf', self.dut.get_memory_channels(), gest_eal_param, ' --rxq=0 --txq=0')
         outstring = self.vm0_testpmd.execute_cmd(command_0, expected='# ')
         self.verify("Either rx or tx queues should be non-zero" in outstring, "The output of testpmd start is different from expect when set invalid VF queue number 0.")
         time.sleep(2)
-        command_17 = "./%s/app/testpmd -c %s -n %d %s -- -i %s" \
-                  % (self.dut.target, '0xf', self.dut.get_memory_channels(), gest_eal_param, ' --rxq=17 --txq=17')
+        command_17 = app_name + "-c %s -n %d %s -- -i %s" % ('0xf', self.dut.get_memory_channels(), gest_eal_param, ' --rxq=17 --txq=17')
         outstring1 = self.vm0_testpmd.execute_cmd(command_17, expected='# ')
         self.verify("rxq 17 invalid - must be >= 0 && <= 16" in outstring1,
                     "The output of testpmd start is different from expect when set invalid VF queue number 17.")
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 4/8] tests/TestSuite_runtime_vf_queue_number_kernel:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (2 preceding siblings ...)
  2020-09-02  9:15 ` [dts] [dts 3/8] tests/TestSuite_runtime_vf_queue_number:support " Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:15 ` [dts] [dts 5/8] tests/TestSuite_veb_switch:support " Xie wei
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_runtime_vf_queue_number_kernel.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_runtime_vf_queue_number_kernel.py b/tests/TestSuite_runtime_vf_queue_number_kernel.py
index 05db5a0..fe4bea0 100644
--- a/tests/TestSuite_runtime_vf_queue_number_kernel.py
+++ b/tests/TestSuite_runtime_vf_queue_number_kernel.py
@@ -208,9 +208,9 @@ class TestRuntimeVfQueueNumberKernel(TestCase):
         for i in invalid_queue_num:
             self.vm0_testpmd = PmdOutput(self.vm_dut_0)
             self.vm_dut_0.session_secondary = self.vm_dut_0.new_session()
-            out = self.vm_dut_0.session_secondary.send_expect(
-                './x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 1 -w %s -- -i --txq=%s --rxq=%s' % (
-                    self.vm_dut_0.vm_pci0, i, i), '# ', 40)
+            app_name = self.vm_dut_0.apps_name['test-pmd']
+            cmd = app_name + "-c 0xf -n 1 -w %s -- -i --txq=%s --rxq=%s" % (self.vm_dut_0.vm_pci0, i, i)
+            out = self.vm_dut_0.session_secondary.send_expect(cmd, "# ", 40)
             if i == 0:
                 self.verify('Either rx or tx queues should be non-zero' in out, "queue number can't be zero")
             else:
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 5/8] tests/TestSuite_veb_switch:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (3 preceding siblings ...)
  2020-09-02  9:15 ` [dts] [dts 4/8] tests/TestSuite_runtime_vf_queue_number_kernel:support " Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:15 ` [dts] [dts 6/8] tests/TestSuite_vf_interrupt_pmd:support " Xie wei
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_veb_switch.py | 37 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/TestSuite_veb_switch.py b/tests/TestSuite_veb_switch.py
index b6b4034..f51a8d3 100644
--- a/tests/TestSuite_veb_switch.py
+++ b/tests/TestSuite_veb_switch.py
@@ -164,6 +164,9 @@ class TestVEBSwitching(TestCase):
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
         self.session_secondary = self.dut.new_session()
         self.session_third = self.dut.new_session()
+        self.pmdout = PmdOutput(self.dut)
+        self.pmdout_2 = PmdOutput(self.dut, self.session_secondary)
+        self.pmdout_3 = PmdOutput(self.dut, self.session_third)
 
         self.pf_kdriver_flag = 0
         self.pf_ddriver_flag = 0
@@ -236,11 +239,11 @@ class TestVEBSwitching(TestCase):
         the packets. Check Inter VF-VF MAC switch.
         """
         self.setup_env(driver='default')
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.dut.send_expect("set fwd txonly", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
 
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>", 5)
@@ -262,12 +265,12 @@ class TestVEBSwitching(TestCase):
         Check if VF2 can receive the packets. Check Inter VF-VF MAC switch.
         """
         self.setup_env(driver='default')
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.dut.send_expect("set fwd mac", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>")
@@ -297,12 +300,12 @@ class TestVEBSwitching(TestCase):
         # the two vfs belongs to different vlans
         self.dut.send_expect("ip link set %s vf 0 vlan 1" % self.pf_interface, "# ", 1)
         self.dut.send_expect("ip link set %s vf 1 vlan 2" % self.pf_interface, "# ", 1)
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.dut.send_expect("set fwd mac", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
         self.session_secondary.send_expect("set fwd mac", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>")
@@ -324,12 +327,12 @@ class TestVEBSwitching(TestCase):
     
         # the two vfs belongs to the same vlan
         self.dut.send_expect("ip link set %s vf 1 vlan 1" % self.pf_interface, "# ", 1)
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.dut.send_expect("set fwd mac", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
         self.session_secondary.send_expect("set fwd mac", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>")
@@ -354,13 +357,13 @@ class TestVEBSwitching(TestCase):
         """
         # VF->PF
         self.setup_env(driver=self.drivername)
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci])
         self.dut.send_expect("set fwd rxonly", "testpmd>")
         self.dut.send_expect("set verbose 1", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.pf_mac_address), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.pf_mac_address)
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd txonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -382,11 +385,11 @@ class TestVEBSwitching(TestCase):
         time.sleep(2)
  
         # PF->VF
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.pf_pci, self.vf0_mac), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], param="--eth-peer=0,%s" % self.vf0_mac)
         self.dut.send_expect("set fwd txonly", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -406,13 +409,13 @@ class TestVEBSwitching(TestCase):
         time.sleep(2)
 
         # tester->VF
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci])
         self.dut.send_expect("set fwd mac", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
 
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -450,15 +453,15 @@ class TestVEBSwitching(TestCase):
         time.sleep(2)
 
         # VF1->VF2
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci])
         self.dut.send_expect("set promisc all off", "testpmd>")
 
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.session_secondary.send_expect("set fwd txonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         time.sleep(2)
 
-        self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci])
         self.session_third.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
         self.session_third.send_expect("set fwd rxonly", "testpmd>")
         self.session_third.send_expect("set promisc all off", "testpmd>")
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 6/8] tests/TestSuite_vf_interrupt_pmd:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (4 preceding siblings ...)
  2020-09-02  9:15 ` [dts] [dts 5/8] tests/TestSuite_veb_switch:support " Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:15 ` [dts] [dts 7/8] tests/TestSuite_vm_power_manager:support " Xie wei
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_vf_interrupt_pmd.py | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/tests/TestSuite_vf_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py
index 55a8e3d..ac30950 100644
--- a/tests/TestSuite_vf_interrupt_pmd.py
+++ b/tests/TestSuite_vf_interrupt_pmd.py
@@ -65,8 +65,6 @@ class TestVfInterruptPmd(TestCase):
         self.port_mask = utils.create_mask(ports)
         self.core_mask_user = utils.create_mask(self.core_list[0:1])
 
-        self.path = "./examples/l3fwd-power/build/l3fwd-power"
-
         testport_0 = self.tester.get_local_port(self.dut_ports[0])
         self.rx_intf_0 = self.tester.get_interface(testport_0)
         self.tester_mac = self.tester.get_mac(testport_0)
@@ -94,6 +92,8 @@ class TestVfInterruptPmd(TestCase):
                 "sed -i -e '/DEV_RX_OFFLOAD_CHECKSUM,/d' \
                 ./examples/l3fwd-power/main.c", "#", 10)
         out = use_dut.send_expect("make -C examples/l3fwd-power", "#")
+        out = use_dut.build_dpdk_apps("./examples/l3fwd-power")
+        self.path = use_dut.apps_name['l3fwd-power']
         self.verify("Error" not in out, "compilation error")
 
     def send_packet(self, mac, testinterface, use_dut):
@@ -127,9 +127,7 @@ class TestVfInterruptPmd(TestCase):
         """
         begin l3fwd-power
         """
-        cmd_vhost_net = "./examples/l3fwd-power/build/l3fwd-power -n %d -c %s" % (
-                use_dut.get_memory_channels(), self.core_mask_user) + \
-                        " -- -P -p 1 --config='(0,0,%s)'" % self.core_user
+        cmd_vhost_net = self.path + "-n %d -c %s" % (use_dut.get_memory_channels(), self.core_mask_user) + " -- -P -p 1 --config='(0,0,%s)'" % self.core_user
         try:
             self.logger.info("Launch l3fwd_sample sample:")
             self.out = use_dut.send_expect(cmd_vhost_net, "L3FWD_POWER", 60)
@@ -149,8 +147,7 @@ class TestVfInterruptPmd(TestCase):
             if config_info != "":
                 config_info += ','
             config_info += '(0,%d,%d)' % (queue, queue)
-        cmd_vhost_net = "./examples/l3fwd-power/build/l3fwd-power -l 0-%d -n 4 -- -P -p 0x1" % \
-                        queue + " --config='%s'" % config_info
+        cmd_vhost_net = self.path + "-l 0-%d -n 4 -- -P -p 0x1" % queue + " --config='%s'" % config_info
         try:
             self.logger.info("Launch l3fwd_sample sample:")
             self.out = use_dut.send_expect(cmd_vhost_net, "L3FWD_POWER", 60)
@@ -239,10 +236,7 @@ class TestVfInterruptPmd(TestCase):
         core_user = core_list[0]
         core_mask_user = utils.create_mask(core_list)
 
-        cmd = self.path + \
-              " -c %s -n %d -- -P  -p 0x01 --config='(0,0,%s)'" % (
-                  core_mask_user, self.vm0_dut.get_memory_channels(), core_user)
-
+        cmd = self.path + "-c %s -n %d -- -P  -p 0x01 --config='(0,0,%s)'" % (core_mask_user, self.vm0_dut.get_memory_channels(), core_user)
         self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60)
         self.send_packet(self.vf0_mac, self.rx_intf_0, self.vm0_dut)
         self.destroy_vm_env()
@@ -365,9 +359,7 @@ class TestVfInterruptPmd(TestCase):
             if config_info != "":
                 config_info += ','
             config_info += '(0,%d,%d)' % (queue, queue)
-        cmd = "./examples/l3fwd-power/build/l3fwd-power -c %s -n 4 -- -P -p 0x1" \
-              % core_mask_user + \
-        " --config='%s'" % config_info
+        cmd = self.path + "-c %s -n 4 -- -P -p 0x1" % core_mask_user + " --config='%s'" % config_info
         self.vm0_dut.send_expect(cmd, "L3FWD_POWER", 60)
         time.sleep(1)
         try:
@@ -397,7 +389,7 @@ class TestVfInterruptPmd(TestCase):
         """
         Run after each test case.
         """
-        self.dut.send_expect("killall l3fwd-power", "# ", 10, alt_session=True)
+        self.dut.send_expect("killall %s" % self.path.strip().split('/')[-1], "# ", 10, alt_session=True)
 
     def tear_down_all(self):
         """
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 7/8] tests/TestSuite_vm_power_manager:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (5 preceding siblings ...)
  2020-09-02  9:15 ` [dts] [dts 6/8] tests/TestSuite_vf_interrupt_pmd:support " Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:15 ` [dts] [dts 8/8] tests/TestSuite_floating_veb:support " Xie wei
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_vm_power_manager.py | 31 ++++++++++-------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/tests/TestSuite_vm_power_manager.py b/tests/TestSuite_vm_power_manager.py
index c34d38c..00910eb 100644
--- a/tests/TestSuite_vm_power_manager.py
+++ b/tests/TestSuite_vm_power_manager.py
@@ -90,8 +90,11 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
             "examples/vm_power_manager/guest_cli")
         self.verify("Error" not in out, "Compilation error")
         self.verify("No such" not in out, "Compilation error")
-        self.vm_power_dir = "./examples/vm_power_manager/"
-        mgr_cmd = self.vm_power_dir + "build/vm_power_mgr -c 0x7 -n 4"
+
+        self.path = self.vm_dut.apps_name['guest_cli']
+        self.guest_cmd = self.path + "-c 0xf -n 4 -- --vm-name=%s --vcpu-list=0,1,2,3" % self.vm_name
+        self.vm_power_dir = self.vm_dut.apps_name['vm_power_manager']
+        mgr_cmd = self.vm_power_dir + "-c 0x7 -n 4"
         out = self.dut.send_expect(mgr_cmd, "vmpower>", 120)
         self.dut.send_expect("add_vm %s" % self.vm_name, "vmpower>")
         self.dut.send_expect("add_channels %s all" % self.vm_name, "vmpower>")
@@ -113,9 +116,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         Check power monitor channel connection
         """
         # check Channels and vcpus
-        guest_cmd = self.vm_power_dir + \
-            "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- --vm-name=%s --vcpu-list=0,1,2,3" % self.vm_name
-        out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
+        out = self.vm_dut.send_expect(self.guest_cmd, "vmpower\(guest\)>", 120)
         self.vm_dut.send_expect("quit", "# ")
 
     def get_cpu_frequency(self, core_id):
@@ -132,9 +133,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         """
         Check host cpu frequency can scale down in VM
         """
-        guest_cmd = self.vm_power_dir + \
-            "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- --vm-name=%s --vcpu-list=0,1,2,3" % self.vm_name
-        out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
+        out = self.vm_dut.send_expect(self.guest_cmd, "vmpower\(guest\)>", 120)
 
         for vcpu in range(self.core_num):
             self.vm_dut.send_expect(
@@ -162,9 +161,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         """
         Check host cpu frequency can scale up in VM
         """
-        guest_cmd = self.vm_power_dir + \
-            "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- --vm-name=%s --vcpu-list=0,1,2,3" % self.vm_name
-        out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
+        out = self.vm_dut.send_expect(self.guest_cmd, "vmpower\(guest\)>", 120)
 
         for vcpu in range(self.core_num):
             self.vm_dut.send_expect(
@@ -189,9 +186,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         """
         Check host cpu frequency can scale to max in VM
         """
-        guest_cmd = self.vm_power_dir + \
-            "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- --vm-name=%s --vcpu-list=0,1,2,3" % self.vm_name
-        out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
+        out = self.vm_dut.send_expect(self.guest_cmd, "vmpower\(guest\)>", 120)
 
         max_freq_path = "cat /sys/devices/system/cpu/cpu%s/cpufreq/" + \
                         "cpuinfo_max_freq"
@@ -212,9 +207,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         """
         Check host cpu frequency can scale to min in VM
         """
-        guest_cmd = self.vm_power_dir + \
-            "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- --vm-name=%s --vcpu-list=0,1,2,3" % self.vm_name
-        out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
+        out = self.vm_dut.send_expect(self.guest_cmd, "vmpower\(guest\)>", 120)
 
         min_freq_path = "cat /sys/devices/system/cpu/cpu%s/cpufreq/" + \
                         "cpuinfo_min_freq"
@@ -276,9 +269,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         self.verify("Error" not in out, "Compilation error")
         self.verify("No such" not in out, "Compilation error")
 
-        guest_cmd = self.vm_power_dir + \
-            "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- --vm-name=%s --vcpu-list=0,1,2,3" % self.vm_name
-        out = vm2_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
+        out = vm2_dut.send_expect(self.guest_cmd, "vmpower\(guest\)>", 120)
         vm2_dut.send_expect("quit", "# ")
         vm2.stop()
 
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [dts 8/8] tests/TestSuite_floating_veb:support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (6 preceding siblings ...)
  2020-09-02  9:15 ` [dts] [dts 7/8] tests/TestSuite_vm_power_manager:support " Xie wei
@ 2020-09-02  9:15 ` " Xie wei
  2020-09-02  9:30 ` [dts] [PATCH V1 0/8] support " Xie, WeiX
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Xie wei @ 2020-09-02  9:15 UTC (permalink / raw)
  To: dts; +Cc: Xie wei

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_floating_veb.py | 56 ++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py
index bf83cb5..f4d62de 100644
--- a/tests/TestSuite_floating_veb.py
+++ b/tests/TestSuite_floating_veb.py
@@ -141,6 +141,9 @@ class TestFloatingVEBSwitching(TestCase):
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
         self.session_secondary = self.dut.new_session()
         self.session_third = self.dut.new_session()
+        self.pmdout = PmdOutput(self.dut)
+        self.pmdout_2 = PmdOutput(self.dut, self.session_secondary)
+        self.pmdout_3 = PmdOutput(self.dut, self.session_third)
         
         self.setup_1pf_ddriver_1vf_env_flag = 0
         self.setup_1pf_ddriver_2vf_env_flag = 0
@@ -156,6 +159,7 @@ class TestFloatingVEBSwitching(TestCase):
         self.pf_interface = self.dut.ports_info[self.used_dut_port]['intf']
         self.pf_mac_address = self.dut.get_mac_address(0)
         self.pf_pci = self.dut.ports_info[self.used_dut_port]['pci']
+        self.path = self.dut.apps_name['test-pmd']
 
     def set_up(self):
         """
@@ -212,12 +216,12 @@ class TestFloatingVEBSwitching(TestCase):
         """
         # VF->PF
         self.setup_env(driver=self.drivername, vf_num=1)
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"})
         self.dut.send_expect("set fwd rxonly", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.pf_mac_address), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.pf_mac_address)
         self.session_secondary.send_expect("set fwd txonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>")
@@ -236,11 +240,11 @@ class TestFloatingVEBSwitching(TestCase):
         time.sleep(2)
 
         #PF->VF
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.pf_pci, self.vf0_mac), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}, param="--eth-peer=0,%s" % self.vf0_mac)
         self.dut.send_expect("set fwd txonly", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
 
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -265,13 +269,13 @@ class TestFloatingVEBSwitching(TestCase):
         """
         #outside world ->VF
         self.setup_env(driver=self.drivername, vf_num=1)
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i --eth-peer=0,%s" % (self.target, self.pf_pci, self.vf0_mac), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"}, param="--eth-peer=0,%s" % self.vf0_mac)
         self.dut.send_expect("set fwd mac", "testpmd>")
         self.dut.send_expect("set promisc all on", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
 
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd mac", "testpmd>")
         self.session_secondary.send_expect("set promisc all on", "testpmd>")
@@ -296,18 +300,18 @@ class TestFloatingVEBSwitching(TestCase):
         # PF link up, VF0->VF1
         self.setup_env(driver=self.drivername, vf_num=2)
         # start PF
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w %s,enable_floating_veb=1 --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+        self.pmdout.start_testpmd("Default", prefix="test1", ports=[self.pf_pci], port_options={self.pf_pci:"enable_floating_veb=1"})
         self.dut.send_expect("port start all", "testpmd>")
         time.sleep(2)
         # start VF0
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>")
         time.sleep(2)
         # start VF1
-        self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.vf0_mac), "testpmd>", 120)
+        self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.vf0_mac)
         self.session_third.send_expect("set fwd txonly", "testpmd>")
         self.session_third.send_expect("set promisc all off", "testpmd>")
         self.session_third.send_expect("start", "testpmd>")
@@ -357,17 +361,18 @@ class TestFloatingVEBSwitching(TestCase):
         """
         self.setup_env(driver=self.drivername, vf_num=4)
         # start PF
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+        cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;2-3\" --file-prefix=test1 -- -i" % self.pf_pci
+        self.dut.send_expect(cmd, "testpmd> ", 120)
         self.dut.send_expect("port start all", "testpmd>")
         time.sleep(2)
         # VF1->VF0
         # start VF0
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         # start VF1
-        self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.vf0_mac), "testpmd>", 120)
+        self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.vf0_mac)
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
         self.session_third.send_expect("set fwd txonly", "testpmd>")
         self.session_third.send_expect("set promisc all off", "testpmd>")
@@ -410,12 +415,12 @@ class TestFloatingVEBSwitching(TestCase):
         # VF0->VF2
         # start VF0
         self.dut.send_expect("port start all", "testpmd>")
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.vf2_mac), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.vf2_mac)
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd txonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         # start VF2
-        self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i" % (self.target, self.sriov_vfs_port[2].pci), "testpmd>", 120)
+        self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci])
         self.session_third.send_expect("mac_addr add 0 %s" % self.vf2_mac, "testpmd>")
         self.session_third.send_expect("set fwd rxonly", "testpmd>")
         self.session_third.send_expect("set promisc all off", "testpmd>")
@@ -444,12 +449,12 @@ class TestFloatingVEBSwitching(TestCase):
         # VF3->VF2
         # start VF3
         self.dut.send_expect("port start all", "testpmd>")
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[3].pci, self.vf2_mac), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[3].pci], param="--eth-peer=0,%s" % self.vf2_mac)
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd txonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         # start VF2
-        self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i" % (self.target, self.sriov_vfs_port[2].pci), "testpmd>", 120)
+        self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci])
         self.session_third.send_expect("mac_addr add 0 %s" % self.vf2_mac, "testpmd>")
         self.session_third.send_expect("set fwd rxonly", "testpmd>")
         self.session_third.send_expect("set promisc all off", "testpmd>")
@@ -486,12 +491,13 @@ class TestFloatingVEBSwitching(TestCase):
         """
         self.setup_env(driver=self.drivername, vf_num=4)
         # VF0->PF
-        self.dut.send_expect("./%s/app/testpmd -c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % (self.target, self.pf_pci), "testpmd>", 120)
+        cmd = self.path + "-c 0xf -n 4 --socket-mem 1024,1024 -w \"%s,enable_floating_veb=1,floating_veb_list=0;3\" --file-prefix=test1 -- -i" % self.pf_pci
+        self.dut.send_expect(cmd, "testpmd> ", 120)
         self.dut.send_expect("set fwd rxonly", "testpmd>")
         self.dut.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[0].pci, self.pf_mac_address), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci], param="--eth-peer=0,%s" % self.pf_mac_address)
         self.session_secondary.send_expect("set fwd txonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>")
@@ -508,7 +514,7 @@ class TestFloatingVEBSwitching(TestCase):
         time.sleep(2)
 
         # VF1->PF
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[1].pci, self.pf_mac_address), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci], param="--eth-peer=0,%s" % self.pf_mac_address)
         self.session_secondary.send_expect("set fwd txonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.dut.send_expect("start", "testpmd>")
@@ -533,7 +539,7 @@ class TestFloatingVEBSwitching(TestCase):
         self.dut.send_expect("start", "testpmd>")
         time.sleep(2)
 
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[0].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[0].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf0_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -551,7 +557,7 @@ class TestFloatingVEBSwitching(TestCase):
         time.sleep(2)
 
         # tester->VF1
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
@@ -569,14 +575,14 @@ class TestFloatingVEBSwitching(TestCase):
         time.sleep(2)
 
         # VF2->VF1
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
         self.session_secondary.send_expect("start", "testpmd>")
         time.sleep(2)
 
-        self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[2].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.session_third.send_expect("set fwd txonly", "testpmd>")
         self.session_third.send_expect("set promisc all off", "testpmd>")
         self.session_third.send_expect("start", "testpmd>")
@@ -596,12 +602,12 @@ class TestFloatingVEBSwitching(TestCase):
         time.sleep(2)
 
         # PF link down, VF2->VF1
-        self.session_secondary.send_expect("./%s/app/testpmd -c 0xf0 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test2 -- -i" % (self.target, self.sriov_vfs_port[1].pci), "testpmd>", 120)
+        self.pmdout_2.start_testpmd("Default", prefix="test2", ports=[self.sriov_vfs_port[1].pci])
         self.session_secondary.send_expect("mac_addr add 0 %s" % self.vf1_mac, "testpmd>")
         self.session_secondary.send_expect("set fwd rxonly", "testpmd>")
         self.session_secondary.send_expect("set promisc all off", "testpmd>")
 
-        self.session_third.send_expect("./%s/app/testpmd -c 0xf00 -n 4 --socket-mem 1024,1024 -w %s --file-prefix=test3 -- -i --eth-peer=0,%s" % (self.target, self.sriov_vfs_port[2].pci, self.vf1_mac), "testpmd>", 120)
+        self.pmdout_3.start_testpmd("Default", prefix="test3", ports=[self.sriov_vfs_port[2].pci], param="--eth-peer=0,%s" % self.vf1_mac)
         self.session_third.send_expect("set fwd txonly", "testpmd>")
         self.session_third.send_expect("set promisc all off", "testpmd>")
         
-- 
2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dts] [PATCH V1 0/8] support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (7 preceding siblings ...)
  2020-09-02  9:15 ` [dts] [dts 8/8] tests/TestSuite_floating_veb:support " Xie wei
@ 2020-09-02  9:30 ` " Xie, WeiX
  2020-09-04  6:07 ` Ma, LihongX
  2020-09-09  8:27 ` Tu, Lijuan
  10 siblings, 0 replies; 12+ messages in thread
From: Xie, WeiX @ 2020-09-02  9:30 UTC (permalink / raw)
  To: dts

[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]

Tested-by:  Xie,WeiX < weix.xie@intel.com>

Regards,
Xie Wei

-----Original Message-----
From: Xie, WeiX 
Sent: Wednesday, September 2, 2020 5:15 PM
To: dts@dpdk.org
Cc: Xie, WeiX <weix.xie@intel.com>
Subject: [dts][PATCH V1 0/8] support meson build method

modify dts to support meson build method.

Xie wei (8):
  tests/TestSuite_flow_filtering:support meson build method
  tests/TestSuite_port_control:support meson build method
  tests/TestSuite_runtime_vf_queue_number:support meson build method
  tests/TestSuite_runtime_vf_queue_number_kernel:support meson build
    method
  tests/TestSuite_veb_switch:support meson build method
  tests/TestSuite_vf_interrupt_pmd:support meson build method
  tests/TestSuite_vm_power_manager:support meson build method
  tests/TestSuite_floating_veb:support meson build method

 tests/TestSuite_floating_veb.py               | 56 ++++++++++---------
 tests/TestSuite_flow_filtering.py             |  5 +-
 tests/TestSuite_port_control.py               |  3 +-
 tests/TestSuite_runtime_vf_queue_number.py    |  7 +--
 ...estSuite_runtime_vf_queue_number_kernel.py |  6 +-
 tests/TestSuite_veb_switch.py                 | 37 ++++++------
 tests/TestSuite_vf_interrupt_pmd.py           | 22 +++-----
 tests/TestSuite_vm_power_manager.py           | 31 ++++------
 8 files changed, 80 insertions(+), 87 deletions(-)

-- 
2.17.1


[-- Attachment #2: TestRuntimeVfQueueNumberKernel.log --]
[-- Type: application/octet-stream, Size: 635345 bytes --]

[-- Attachment #3: TestVEBSwitching.log --]
[-- Type: application/octet-stream, Size: 2755326 bytes --]

[-- Attachment #4: TestVfInterruptPmd.log --]
[-- Type: application/octet-stream, Size: 443075 bytes --]

[-- Attachment #5: TestVmPowerManager.log --]
[-- Type: application/octet-stream, Size: 617713 bytes --]

[-- Attachment #6: TestFloatingVEBSwitching.log --]
[-- Type: application/octet-stream, Size: 32907 bytes --]

[-- Attachment #7: TestPortControl.log --]
[-- Type: application/octet-stream, Size: 280530 bytes --]

[-- Attachment #8: TestRuntimeVfQn.log --]
[-- Type: application/octet-stream, Size: 1404648 bytes --]

[-- Attachment #9: TestFlowFiltering.log --]
[-- Type: application/octet-stream, Size: 5786 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dts] [PATCH V1 0/8] support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (8 preceding siblings ...)
  2020-09-02  9:30 ` [dts] [PATCH V1 0/8] support " Xie, WeiX
@ 2020-09-04  6:07 ` Ma, LihongX
  2020-09-09  8:27 ` Tu, Lijuan
  10 siblings, 0 replies; 12+ messages in thread
From: Ma, LihongX @ 2020-09-04  6:07 UTC (permalink / raw)
  To: Xie, WeiX, dts; +Cc: Xie, WeiX

Acked-by: lihongx ma<lihongx.ma@intel.com>

Regards,
Ma,lihong

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Xie wei
> Sent: Wednesday, September 2, 2020 5:15 PM
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts] [PATCH V1 0/8] support meson build method
> 
> modify dts to support meson build method.
> 
> Xie wei (8):
>   tests/TestSuite_flow_filtering:support meson build method
>   tests/TestSuite_port_control:support meson build method
>   tests/TestSuite_runtime_vf_queue_number:support meson build method
>   tests/TestSuite_runtime_vf_queue_number_kernel:support meson build
>     method
>   tests/TestSuite_veb_switch:support meson build method
>   tests/TestSuite_vf_interrupt_pmd:support meson build method
>   tests/TestSuite_vm_power_manager:support meson build method
>   tests/TestSuite_floating_veb:support meson build method
> 
>  tests/TestSuite_floating_veb.py               | 56 ++++++++++---------
>  tests/TestSuite_flow_filtering.py             |  5 +-
>  tests/TestSuite_port_control.py               |  3 +-
>  tests/TestSuite_runtime_vf_queue_number.py    |  7 +--
>  ...estSuite_runtime_vf_queue_number_kernel.py |  6 +-
>  tests/TestSuite_veb_switch.py                 | 37 ++++++------
>  tests/TestSuite_vf_interrupt_pmd.py           | 22 +++-----
>  tests/TestSuite_vm_power_manager.py           | 31 ++++------
>  8 files changed, 80 insertions(+), 87 deletions(-)
> 
> --
> 2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dts] [PATCH V1 0/8] support meson build method
  2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
                   ` (9 preceding siblings ...)
  2020-09-04  6:07 ` Ma, LihongX
@ 2020-09-09  8:27 ` Tu, Lijuan
  10 siblings, 0 replies; 12+ messages in thread
From: Tu, Lijuan @ 2020-09-09  8:27 UTC (permalink / raw)
  To: Xie, WeiX, dts; +Cc: Xie, WeiX

Applied

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Xie wei
> Sent: 2020^[$BG/^[(B9^[$B7n^[(B2^[$BF|^[(B 17:15
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts] [PATCH V1 0/8] support meson build method
> 
> modify dts to support meson build method.
> 
> Xie wei (8):
>   tests/TestSuite_flow_filtering:support meson build method
>   tests/TestSuite_port_control:support meson build method
>   tests/TestSuite_runtime_vf_queue_number:support meson build method
>   tests/TestSuite_runtime_vf_queue_number_kernel:support meson build
>     method
>   tests/TestSuite_veb_switch:support meson build method
>   tests/TestSuite_vf_interrupt_pmd:support meson build method
>   tests/TestSuite_vm_power_manager:support meson build method
>   tests/TestSuite_floating_veb:support meson build method
> 
>  tests/TestSuite_floating_veb.py               | 56 ++++++++++---------
>  tests/TestSuite_flow_filtering.py             |  5 +-
>  tests/TestSuite_port_control.py               |  3 +-
>  tests/TestSuite_runtime_vf_queue_number.py    |  7 +--
>  ...estSuite_runtime_vf_queue_number_kernel.py |  6 +-
>  tests/TestSuite_veb_switch.py                 | 37 ++++++------
>  tests/TestSuite_vf_interrupt_pmd.py           | 22 +++-----
>  tests/TestSuite_vm_power_manager.py           | 31 ++++------
>  8 files changed, 80 insertions(+), 87 deletions(-)
> 
> --
> 2.17.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, back to index

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-02  9:15 [dts] [PATCH V1 0/8] support meson build method Xie wei
2020-09-02  9:15 ` [dts] [dts 1/8] tests/TestSuite_flow_filtering:support " Xie wei
2020-09-02  9:15 ` [dts] [dts 2/8] tests/TestSuite_port_control:support " Xie wei
2020-09-02  9:15 ` [dts] [dts 3/8] tests/TestSuite_runtime_vf_queue_number:support " Xie wei
2020-09-02  9:15 ` [dts] [dts 4/8] tests/TestSuite_runtime_vf_queue_number_kernel:support " Xie wei
2020-09-02  9:15 ` [dts] [dts 5/8] tests/TestSuite_veb_switch:support " Xie wei
2020-09-02  9:15 ` [dts] [dts 6/8] tests/TestSuite_vf_interrupt_pmd:support " Xie wei
2020-09-02  9:15 ` [dts] [dts 7/8] tests/TestSuite_vm_power_manager:support " Xie wei
2020-09-02  9:15 ` [dts] [dts 8/8] tests/TestSuite_floating_veb:support " Xie wei
2020-09-02  9:30 ` [dts] [PATCH V1 0/8] support " Xie, WeiX
2020-09-04  6:07 ` Ma, LihongX
2020-09-09  8:27 ` Tu, Lijuan

test suite reviews and discussions

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ http://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/ public-inbox