[dts] [PATCH V1 0/5] support meson build method

[dts] [PATCH V1 0/5] support meson build method

[Xie wei]

modify dts to support meson build method

Xie wei (5):
  tests/TestSuite_cvl_advanced_rss:support meson build method
  tests/TestSuite_cvl_dcf_switch_filter:support meson build method
  tests/TestSuite_cvl_fdir:support meson build method
  tests/TestSuite_cvl_rss_configure:support meson build method
  tests/TestSuite_cvl_switch_filter:support meson build method

 tests/TestSuite_cvl_advanced_rss.py      |  2 +-
 tests/TestSuite_cvl_dcf_switch_filter.py | 15 ++++++++-------
 tests/TestSuite_cvl_fdir.py              |  2 +-
 tests/TestSuite_cvl_rss_configure.py     |  2 +-
 tests/TestSuite_cvl_switch_filter.py     |  5 +++--
 5 files changed, 14 insertions(+), 12 deletions(-)

-- 
2.17.1

[dts] [PATCH V1 1/5] tests/TestSuite_cvl_advanced_rss:support meson build method

[Xie wei]

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

diff --git a/tests/TestSuite_cvl_advanced_rss.py b/tests/TestSuite_cvl_advanced_rss.py
index 44c8b23..03ad6b0 100644
--- a/tests/TestSuite_cvl_advanced_rss.py
+++ b/tests/TestSuite_cvl_advanced_rss.py
@@ -851,7 +851,7 @@ class AdvancedRSSTest(TestCase):
         #Prepare testpmd EAL and parameters 
         all_eal_param = self.dut.create_eal_parameters(ports=[self.pf_pci])
         print(all_eal_param)   #print eal parameters
-        command = "./%s/app/testpmd %s  -- -i %s" % (self.dut.target, all_eal_param, "--rxq=64 --txq=64")
+        command = self.dut.apps_name['test-pmd'] + all_eal_param + " -- -i --rxq=64 --txq=64"
         return command
 
     def _rte_flow_validate_pattern(self, test_vectors, command, is_vxlan):
-- 
2.17.1

[dts] [PATCH V1 2/5] tests/TestSuite_cvl_dcf_switch_filter:support meson build method

[Xie wei]

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

diff --git a/tests/TestSuite_cvl_dcf_switch_filter.py b/tests/TestSuite_cvl_dcf_switch_filter.py
index d52e487..245e9df 100644
--- a/tests/TestSuite_cvl_dcf_switch_filter.py
+++ b/tests/TestSuite_cvl_dcf_switch_filter.py
@@ -1268,6 +1268,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         #set vf driver
         self.vf_driver = 'vfio-pci'
         self.dut.send_expect('modprobe vfio-pci', '#')
+        self.path = self.dut.apps_name['test-pmd']
 
     def setup_1pf_vfs_env(self, pf_port=0, driver='default'):
 
@@ -1308,7 +1309,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         vf0_pci = self.sriov_vfs_port_0[0].pci
         vf1_pci = self.sriov_vfs_port_0[1].pci
         all_eal_param = self.dut.create_eal_parameters(cores='1S/4C/1T',ports=[vf0_pci, vf1_pci], port_options={vf0_pci:"cap=dcf"})
-        command = "./%s/app/testpmd %s -- -i" % (self.dut.target, all_eal_param)
+        command = self.path + all_eal_param + " -- -i"
         return command
 
     def launch_testpmd(self):
@@ -1788,7 +1789,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         vf1_pci = self.sriov_vfs_port_0[1].pci
         vf2_pci = self.sriov_vfs_port_0[2].pci
         all_eal_param = self.dut.create_eal_parameters(cores="1S/4C/1T", ports=[vf0_pci, vf1_pci, vf2_pci], port_options={vf0_pci:"cap=dcf"})
-        command = "./%s/app/testpmd %s -- -i" % (self.dut.target, all_eal_param)
+        command = self.path + all_eal_param + " -- -i"
         out = self.dut.send_expect(command, "testpmd> ", 15)
         self.testpmd_status = "running"
         self.dut.send_expect("set portlist 1,2", "testpmd> ", 15)
@@ -1839,7 +1840,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         vf1_pci = self.sriov_vfs_port_0[1].pci
         vf2_pci = self.sriov_vfs_port_0[2].pci
         all_eal_param = self.dut.create_eal_parameters(cores="1S/4C/1T", ports=[vf0_pci, vf1_pci, vf2_pci], port_options={vf0_pci:"cap=dcf"})
-        command = "./%s/app/testpmd %s -- -i" % (self.dut.target, all_eal_param)
+        command = self.path + all_eal_param + " -- -i"
         out = self.dut.send_expect(command, "testpmd> ", 15)
         self.testpmd_status = "running"
         self.dut.send_expect("set portlist 1,2", "testpmd> ", 15)
@@ -1903,7 +1904,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         vf1_pci = self.sriov_vfs_port_0[1].pci
         vf2_pci = self.sriov_vfs_port_0[2].pci
         all_eal_param = self.dut.create_eal_parameters(cores="1S/4C/1T", ports=[vf0_pci, vf1_pci, vf2_pci], port_options={vf0_pci:"cap=dcf"})
-        command = "./%s/app/testpmd %s -- -i" % (self.dut.target, all_eal_param)
+        command = self.path + all_eal_param + " -- -i"
         out = self.dut.send_expect(command, "testpmd> ", 15)
         self.testpmd_status = "running"
         self.dut.send_expect("set portlist 1,2", "testpmd> ", 15)
@@ -1955,7 +1956,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         #launch testpmd
         vf0_pci = vf_pci[0]
         all_eal_param = self.dut.create_eal_parameters(cores="1S/4C/1T", ports=[vf0_pci], port_options={vf0_pci:"cap=dcf"})
-        command = "./%s/app/testpmd %s -- -i" % (self.dut.target, all_eal_param)
+        command = self.path + all_eal_param + " -- -i"
         out = self.dut.send_expect(command, "testpmd> ", 15)
         self.testpmd_status = "running"
         #generate max_vf_number-1 rules to each vf and matched packets
@@ -2049,7 +2050,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         vf0_pci = self.sriov_vfs_port_0[0].pci
         vf1_pci = self.sriov_vfs_port_0[1].pci
         all_eal_param = self.dut.create_eal_parameters(cores="1S/4C/1T", ports=[vf0_pci, vf1_pci], port_options={vf0_pci:"cap=dcf"})
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, all_eal_param, "--cmdline-file=/tmp/testpmd_cmds_32k_switch_rules")
+        command = self.path + all_eal_param +  " -- -i --cmdline-file=/tmp/testpmd_cmds_32k_switch_rules"
         out = self.dut.send_expect(command, "testpmd> ", 360)
         self.testpmd_status = "running"
         self.dut.send_expect("set portlist 1", "testpmd> ", 15)
@@ -2143,7 +2144,7 @@ class CVLDCFSwitchFilterTest(TestCase):
         vf1_pci = self.sriov_vfs_port_0[1].pci
         vf2_pci = self.sriov_vfs_port_0[2].pci
         all_eal_param = self.dut.create_eal_parameters(cores="1S/4C/1T", ports=[vf0_pci, vf1_pci, vf2_pci], port_options={vf0_pci:"cap=dcf"})
-        command = "./%s/app/testpmd %s -- -i" % (self.dut.target, all_eal_param)
+        command = self.path + all_eal_param + " -- -i"
         out = self.dut.send_expect(command, "testpmd> ", 15)
         self.testpmd_status = "running"
         self.dut.send_expect("set portlist 1,2", "testpmd> ", 15)
-- 
2.17.1

[dts] [PATCH V1 3/5] tests/TestSuite_cvl_fdir:support meson build method

[Xie wei]

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

diff --git a/tests/TestSuite_cvl_fdir.py b/tests/TestSuite_cvl_fdir.py
index 3bbb830..474ec2c 100644
--- a/tests/TestSuite_cvl_fdir.py
+++ b/tests/TestSuite_cvl_fdir.py
@@ -3036,7 +3036,7 @@ class TestCVLFdir(TestCase):
                                                        socket=self.ports_socket)
             param = " --log-level='ice,7' -- -i --portmask=%s --rxq=%d --txq=%d --port-topology=loop --cmdline-file=%s" % (
                 self.portMask, 64, 64, cmd_path)
-            command_line = self.dut.target + "/app/testpmd " + eal_param + param
+            command_line = self.dut.apps_name['test-pmd'] + eal_param + param
             out = self.dut.send_expect(command_line, 'testpmd>', timeout=600)
             self.verify('Failed to create file' not in out, "create some rule failed: %s" % out)
             self.config_testpmd()
-- 
2.17.1

[dts] [PATCH V1 4/5] tests/TestSuite_cvl_rss_configure:support meson build method

[Xie wei]

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

diff --git a/tests/TestSuite_cvl_rss_configure.py b/tests/TestSuite_cvl_rss_configure.py
index c8ca6d5..65b4d57 100644
--- a/tests/TestSuite_cvl_rss_configure.py
+++ b/tests/TestSuite_cvl_rss_configure.py
@@ -202,7 +202,7 @@ class RSSConfigureTest(TestCase):
         #Prepare testpmd EAL and parameters 
         all_eal_param = self.dut.create_eal_parameters(ports=[self.pf_pci])
         print(all_eal_param)   #print eal parameters
-        command = "./%s/app/testpmd %s  -- -i %s" % (self.dut.target, all_eal_param, "--rxq=10 --txq=10" + line_option)
+        command = self.dut.apps_name['test-pmd'] + all_eal_param + " -- -i --rxq=10 --txq=10" + line_option
         return command
 
     def _rss_validate_pattern(self, test_vectors, command, rss_type, is_rss):
-- 
2.17.1

[dts] [PATCH V1 5/5] tests/TestSuite_cvl_switch_filter:support meson build method

[Xie wei]

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

diff --git a/tests/TestSuite_cvl_switch_filter.py b/tests/TestSuite_cvl_switch_filter.py
index 4e81a3e..296ab22 100644
--- a/tests/TestSuite_cvl_switch_filter.py
+++ b/tests/TestSuite_cvl_switch_filter.py
@@ -4527,6 +4527,7 @@ class CVLSwitchFilterTest(TestCase):
         self.bind_nics_driver(self.dut_ports, driver="vfio-pci")
 
         self.generate_file_with_fdir_rules()
+        self.path = self.dut.apps_name['test-pmd']
 
     def set_up(self):
         """
@@ -4570,7 +4571,7 @@ class CVLSwitchFilterTest(TestCase):
         """
         #Prepare testpmd EAL and parameters
         all_eal_param = self.dut.create_eal_parameters(cores='1S/4C/1T', ports=[0])
-        command = "./%s/app/testpmd %s --log-level=\"ice,8\" -- -i %s" % (self.dut.target, all_eal_param, "--rxq=16 --txq=16 --cmdline-file=%s" % self.fdir_file)
+        command = self.path + all_eal_param + " --log-level=\"ice,8\" -- -i --rxq=16 --txq=16 --cmdline-file=%s" % self.fdir_file
         # command = "./%s/app/testpmd %s --log-level=\"ice,8\" -- -i %s" % (self.dut.target, all_eal_param, "--rxq=16 --txq=16")
         return command
 
@@ -4580,7 +4581,7 @@ class CVLSwitchFilterTest(TestCase):
         """
         #Prepare testpmd EAL and parameters
         all_eal_param = self.dut.create_eal_parameters(cores='1S/4C/1T', ports=[0], port_options={0:"pipeline-mode-support=1"})
-        command = "./%s/app/testpmd %s --log-level=\"ice,8\" -- -i %s" % (self.dut.target, all_eal_param, "--rxq=16 --txq=16")
+        command = self.path + all_eal_param + " --log-level=\"ice,8\" -- -i --rxq=16 --txq=16"
         return command
 
     def launch_testpmd(self, is_non_pipeline):
-- 
2.17.1

Re: [dts] [PATCH V1 0/5] support meson build method

[Tu, Lijuan]

> Subject: [dts] [PATCH V1 0/5] support meson build method
> 
> modify dts to support meson build method
> 
> Xie wei (5):
>   tests/TestSuite_cvl_advanced_rss:support meson build method
>   tests/TestSuite_cvl_dcf_switch_filter:support meson build method
>   tests/TestSuite_cvl_fdir:support meson build method
>   tests/TestSuite_cvl_rss_configure:support meson build method
>   tests/TestSuite_cvl_switch_filter:support meson build method

Applied