[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_iavf_package_driver_error_handle:support meson build
    method
  tests/TestSuite_enable_package_download_in_ice_driver:support meson
    build method
  tests/TestSuite_rteflow_priority:support meson build method
  tests/TestSuite_iavf_fdir:support meson build method
  tests/TestSuite_dcf_lifecycle:support meson build method

 tests/TestSuite_dcf_lifecycle.py              | 10 +++----
 ...e_enable_package_download_in_ice_driver.py |  5 ++--
 tests/TestSuite_iavf_fdir.py                  | 27 ++++++++++---------
 ...tSuite_iavf_package_driver_error_handle.py |  2 +-
 tests/TestSuite_rteflow_priority.py           | 17 ++++++------
 5 files changed, 31 insertions(+), 30 deletions(-)

-- 
2.17.1

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

[Xie wei]

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

diff --git a/tests/TestSuite_iavf_package_driver_error_handle.py b/tests/TestSuite_iavf_package_driver_error_handle.py
index a59b933..d155afc 100644
--- a/tests/TestSuite_iavf_package_driver_error_handle.py
+++ b/tests/TestSuite_iavf_package_driver_error_handle.py
@@ -247,7 +247,7 @@ class Testiavf_package_and_driver_check(TestCase):
            for port in self.sriov_vfs_port:
                port.bind_driver('vfio-pci')
 
-           testpmdcmd ='./x86_64-native-linuxapp-gcc/app/testpmd -l 6-9 -n 4  --file-prefix=vf -- -i --rxq=4 --txq=4  --nb-cores=2'
+           testpmdcmd = self.dut.apps_name['test-pmd'] + "-l 6-9 -n 4  --file-prefix=vf -- -i --rxq=4 --txq=4  --nb-cores=2"
            self.dut_testpmd.execute_cmd(testpmdcmd)
            out=self.dut_testpmd.execute_cmd('flow create 0 ingress pattern eth / ipv4 / end actions rss types l3-dst-only end key_len 0 queues end / end')
            self.verify("iavf_flow_create(): Failed to create flow" in out, "There should be '%s' in out: %s" % ("iavf_flow_create(): Failed to create flow", out))
-- 
2.17.1

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

[Xie wei]

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

diff --git a/tests/TestSuite_enable_package_download_in_ice_driver.py b/tests/TestSuite_enable_package_download_in_ice_driver.py
index 5364975..b57eb79 100644
--- a/tests/TestSuite_enable_package_download_in_ice_driver.py
+++ b/tests/TestSuite_enable_package_download_in_ice_driver.py
@@ -53,6 +53,7 @@ class TestEnable_Package_Download_In_Ice_Driver(TestCase):
         self.dut_p0_mac = self.dut.get_mac_address(self.dut_ports[0])
         self.tester_p0_mac = self.tester.get_mac(localPort0)
         self.dut_testpmd = PmdOutput(self.dut)
+        self.path = self.dut.apps_name['test-pmd']
 
         self.pkg_file1 = '/lib/firmware/intel/ice/ddp/ice.pkg'
         self.pkg_file2 = '/lib/firmware/updates/intel/ice/ddp/ice.pkg'
@@ -288,7 +289,7 @@ class TestEnable_Package_Download_In_Ice_Driver(TestCase):
         use wrong ice.pkg and start testpmd without "safe-mode-suppor", no port is loaded in testpmd
         """
         self.use_correct_ice_pkg(flag="false")
-        cmd = "./%s/app/testpmd -c 0x7 -n 4 -- -i --nb-cores=8 --rxq=%s --txq=%s --port-topology=chained" % (self.target, self.PF_QUEUE, self.PF_QUEUE)
+        cmd = self.path + "-c 0x7 -n 4 -- -i --nb-cores=8 --rxq=%s --txq=%s --port-topology=chained" % (self.PF_QUEUE, self.PF_QUEUE)
         out = self.dut.send_expect(cmd, "#", 60)
         error_messages = ["ice_load_pkg(): failed to allocate buf of size 0 for package", \
                 "ice_dev_init(): Failed to load the DDP package,Use safe-mode-support=1 to enter Safe Mode"]
@@ -340,7 +341,7 @@ class TestEnable_Package_Download_In_Ice_Driver(TestCase):
             self.generate_delete_specify_pkg(pkg_ver=self.new_pkgs[i], sn=self.nic_sn[i], key="true")
 
         eal_param = "-w %s " % self.nic_pci[0] + "-w %s " % self.nic_pci[1] + "--log-level=8"
-        out = self.dut_testpmd.execute_cmd("./%s/app/testpmd %s -- -i " % (self.target, eal_param))
+        out = self.dut_testpmd.execute_cmd(self.path + eal_param + " -- -i ")
         self.dut_testpmd.quit()
 
         # Delete ice-<interface serial number>.pkg to recover the ENV
-- 
2.17.1

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

[Xie wei]

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

diff --git a/tests/TestSuite_rteflow_priority.py b/tests/TestSuite_rteflow_priority.py
index 26e8d82..353dc8f 100644
--- a/tests/TestSuite_rteflow_priority.py
+++ b/tests/TestSuite_rteflow_priority.py
@@ -65,6 +65,7 @@ class TestRteflowPriority(TestCase):
         cores = self.dut.get_core_list("1S/5C/1T")
         self.coreMask = utils.create_mask(cores)
         self.portMask = utils.create_mask([self.dut_ports[0]])
+        self.path = self.dut.apps_name['test-pmd']
     
     def set_up(self):
         """
@@ -133,7 +134,7 @@ class TestRteflowPriority(TestCase):
         """
         #start testpmd in pipeline mode
         # genarate eal
-        command = './%s/app/testpmd -c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
         self.logger.debug(out)
         
@@ -200,7 +201,7 @@ class TestRteflowPriority(TestCase):
         """
         
         #start testpmd without pipeline-mode-support parameter, check the testpmd is launch in non-pipeline mode
-        command = './%s/app/testpmd -c %s -n 4 -w %s --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
         self.logger.debug(out)
         
@@ -212,7 +213,7 @@ class TestRteflowPriority(TestCase):
         self.dut.send_expect("quit", "#", 50)
         
         #restart testpmd with pipeline-mode-support=0, check the testpmd is launch in non-pipeline mode
-        command = './%s/app/testpmd -c %s -n 4 -w %s,pipeline-mode-support=0 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s,pipeline-mode-support=0 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
         self.logger.debug(out)
         
@@ -229,7 +230,7 @@ class TestRteflowPriority(TestCase):
         """
         
         #start testpmd in pipeline mode
-        command = './%s/app/testpmd -c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
         self.logger.debug(out)
         
@@ -246,7 +247,7 @@ class TestRteflowPriority(TestCase):
         """
         
         #start testpmd in pipeline mode
-        command = './%s/app/testpmd -c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
         self.logger.debug(out)
 
@@ -263,7 +264,7 @@ class TestRteflowPriority(TestCase):
         """
         
         #start testpmd in pipeline mode
-        command = './%s/app/testpmd -c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
         self.logger.debug(out)
 
@@ -280,7 +281,7 @@ class TestRteflowPriority(TestCase):
         """
 
         #start testpmd in pipeline mode
-        command = './%s/app/testpmd -c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
 
         self.dut.send_expect("set fwd rxonly", "testpmd> ", 15)
@@ -317,7 +318,7 @@ class TestRteflowPriority(TestCase):
         self.dut.send_expect("quit", "#", 50)
 
         #restart testpmd in pipeline mode
-        command = './%s/app/testpmd -c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.target, self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
+        command = self.path + '-c %s -n 4 -w %s,pipeline-mode-support=1 --log-level="ice,7" -- -i --portmask=%s --rxq=10 --txq=10' % (self.coreMask, self.dut.ports_info[0]['pci'], utils.create_mask([self.dut_ports[0]]))
         out = self.dut.send_expect(command, "testpmd> ", 120)
         self.logger.debug(out)
 
-- 
2.17.1

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

[Xie wei]

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

diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_iavf_fdir.py
index eaea13f..3deadff 100644
--- a/tests/TestSuite_iavf_fdir.py
+++ b/tests/TestSuite_iavf_fdir.py
@@ -1993,6 +1993,7 @@ class TestIAVFFdir(TestCase):
 
         self.pkt = Packet()
         self.pmd_output = PmdOutput(self.dut)
+        self.path = self.dut.apps_name['test-pmd']
 
         self.src_file_dir = 'dep/'
         self.dut_file_dir = '/tmp/'
@@ -2563,12 +2564,12 @@ class TestIAVFFdir(TestCase):
         m1 = p.search(out_pf1)
 
         eal_param = "-c 0xf -n 6 -w %s -w %s --file-prefix=pf0" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf0[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num))
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
 
         eal_param = "-c 0xf0 -n 6 -w %s -w %s --file-prefix=pf1" % (self.sriov_vfs_pf1[0].pci,self.sriov_vfs_pf1[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num))
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         #self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
@@ -2716,12 +2717,12 @@ class TestIAVFFdir(TestCase):
         m1 = p.search(out_pf1)
 
         eal_param = "-c 0xf -n 6 -w %s -w %s --file-prefix=pf0" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf0[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num))
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
 
         eal_param = "-c 0xf0 -n 6 -w %s -w %s --file-prefix=pf1" % (self.sriov_vfs_pf1[0].pci,self.sriov_vfs_pf1[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num))
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         #self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
@@ -2869,12 +2870,12 @@ class TestIAVFFdir(TestCase):
         m1 = p.search(out_pf1)
 
         eal_param = "-c 0xf -n 6 -w %s -w %s --file-prefix=pf0" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf0[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num))
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
 
         eal_param = "-c 0xf0 -n 6 -w %s -w %s --file-prefix=pf1" % (self.sriov_vfs_pf1[0].pci,self.sriov_vfs_pf1[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num))
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         #self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
@@ -3006,7 +3007,7 @@ class TestIAVFFdir(TestCase):
         self.dut.session.copy_file_to(self.src_file_dir + src_file, self.dut_file_dir)
 
         eal_param = "-c f -n 6 -w %s -w %s" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf0[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={} --cmdline-file=%s".format(self.cvlq_num, self.cvlq_num) % self.dut_file_dir + src_file)
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num) + " --cmdline-file=%s" % self.dut_file_dir + src_file
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
 
@@ -3076,7 +3077,7 @@ class TestIAVFFdir(TestCase):
         self.dut.session.copy_file_to(self.src_file_dir + src_file, self.dut_file_dir)
 
         eal_param = "-c f -n 6 -w %s -w %s" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf1[0].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={} --cmdline-file=%s".format(self.cvlq_num, self.cvlq_num) % self.dut_file_dir + src_file)
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num) + " --cmdline-file=%s" % self.dut_file_dir + src_file
         self.dut.send_expect(command, "testpmd> ", 300)
 
         self.config_testpmd()
@@ -3192,7 +3193,7 @@ class TestIAVFFdir(TestCase):
 
         # start testpmd with creating rules in commandline
         eal_param = "-c f -n 6 -w %s -w %s" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf0[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={} --cmdline-file=%s".format(self.cvlq_num, self.cvlq_num) % self.dut_file_dir + src_file_vf)
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num) + " --cmdline-file=%s" % self.dut_file_dir + src_file_vf
         fdw = open("15360_rules_vf_result.txt", "w")
         fdw.write(self.dut.send_expect(command, "testpmd> ", 360))
         fdw.close()
@@ -3269,7 +3270,7 @@ class TestIAVFFdir(TestCase):
         self.dut.send_expect("ethtool -N %s flow-type tcp4 src-ip 192.168.100.0 dst-ip 192.168.100.2 src-port 32 dst-port 33 action 8" % self.pf1_intf, "Cannot insert RX class rule: No space left on device")
         # start testpmd with creating rules in commandline
         eal_param = "-c f -n 6 -w %s -w %s" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf1[0].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num))
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
         self.dut.send_expect(command, "testpmd> ", 20)
 
         self.config_testpmd()
@@ -3330,7 +3331,7 @@ class TestIAVFFdir(TestCase):
             self.verify(False, 'The number of ports is not supported')
 
         self.dut.send_expect("ip link set {} vf {} mac 00:11:22:33:44:55".format(self.pf0_intf, nex_cnt), '#')
-        command = "./%s/app/testpmd -c f -n 6 -- -i %s" % (self.dut.target, "--rxq=4 --txq=4")
+        command = self.path + " -c f -n 6 -- -i --rxq=4 --txq=4"
         self.dut.send_expect(command, "testpmd> ", 360)
         self.config_testpmd()
 
@@ -3414,7 +3415,7 @@ class TestIAVFFdir(TestCase):
         self.dut.session.copy_file_to(self.src_file_dir + src_file, self.dut_file_dir)
 
         eal_param = "-c f -n 6 -w %s -w %s" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf0[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={} --cmdline-file=%s".format(self.cvlq_num, self.cvlq_num) % self.dut_file_dir + src_file)
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num) + " --cmdline-file=%s" % self.dut_file_dir + src_file
         self.dut.send_expect(command, "testpmd> ", 900)
         self.config_testpmd()
         self.check_fdir_rule(port_id=0, stats=False)
@@ -3449,7 +3450,7 @@ class TestIAVFFdir(TestCase):
         self.dut.session.copy_file_to(self.src_file_dir + src_file, self.dut_file_dir)
 
         eal_param = "-c f -n 6 -w %s -w %s" % (self.sriov_vfs_pf0[0].pci,self.sriov_vfs_pf0[1].pci)
-        command = "./%s/app/testpmd %s -- -i %s" % (self.dut.target, eal_param, "--rxq={} --txq={} --cmdline-file=%s".format(self.cvlq_num, self.cvlq_num) % self.dut_file_dir + src_file)
+        command = self.path + eal_param + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num) + " --cmdline-file=%s" % self.dut_file_dir + src_file
         self.dut.send_expect(command, "testpmd> ", 900)
         self.config_testpmd()
         self.check_fdir_rule(port_id=0, stats=False)
-- 
2.17.1

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

[Xie wei]

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

diff --git a/tests/TestSuite_dcf_lifecycle.py b/tests/TestSuite_dcf_lifecycle.py
index 6be7b24..76c29f8 100644
--- a/tests/TestSuite_dcf_lifecycle.py
+++ b/tests/TestSuite_dcf_lifecycle.py
@@ -302,8 +302,7 @@ class TestDcfLifeCycle(TestCase):
         return output
 
     def init_vf_dcf_testpmd(self):
-        self.vf_dcf_testpmd = "{}/{}/app/testpmd".format(
-            self.target_dir, self.dut.target)
+        self.vf_dcf_testpmd = self.dut.apps_name['test-pmd']
 
     def start_vf_dcf_testpmd(self, pmd_opiton):
         whitelist_name, prefix = pmd_opiton
@@ -359,16 +358,15 @@ class TestDcfLifeCycle(TestCase):
         return output
 
     def create_vf_testpmd2(self):
-        self.vf_testpmd2 = "{}/{}/app/testpmd_vf".format(
-            self.target_dir, self.dut.target)
-        cmd = 'rm -f {vf_pmd2};cp {vf_dcf_pmd} {vf_pmd2}'.format(
+        self.vf_testpmd2 = self.dut.apps_name['testpmd_vf']
+        cmd = 'rm -f /root/dpdk/{vf_pmd2};cp /root/dpdk/{vf_dcf_pmd} /root/dpdk/{vf_pmd2}'.format(
             **{'vf_dcf_pmd': self.vf_dcf_testpmd, 'vf_pmd2': self.vf_testpmd2})
         self.d_a_con(cmd)
 
     def init_vf_testpmd2(self):
         self.create_vf_testpmd2()
         self.vf_pmd2_session_name = 'vf_testpmd2'
-        self.vf_pmd2_session = self.dut.create_session(
+        self.vf_pmd2_session = self.dut.new_session(
             self.vf_pmd2_session_name)
 
     def start_vf_testpmd2(self, pmd_opiton):
-- 
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_iavf_package_driver_error_handle:support meson build
>     method
>   tests/TestSuite_enable_package_download_in_ice_driver:support meson
>     build method
>   tests/TestSuite_rteflow_priority:support meson build method
>   tests/TestSuite_iavf_fdir:support meson build method
>   tests/TestSuite_dcf_lifecycle:support meson build method

Applied