[V1] tests/TestSuite_packet_capture: adapt meson build

Message ID 20201102094016.14389-1-junx.w.zhou@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] tests/TestSuite_packet_capture: adapt meson build |

Commit Message

Zhou, JunX W Nov. 2, 2020, 9:40 a.m. UTC
  adapt meson build

Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_packet_capture.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
  

Comments

Zhou, JunX W Nov. 2, 2020, 9:40 a.m. UTC | #1
Tested-by: Zhou, Jun <junx.w.zhou@intel.com>

-----Original Message-----
From: Zhou, Jun [mailto:junx.w.zhou@intel.com] 
Sent: Monday, November 2, 2020 5:40 PM
To: dts@dpdk.org
Cc: Zhou, JunX W <junx.w.zhou@intel.com>; Zhou
Subject: [dts][PATCH V1] tests/TestSuite_packet_capture: adapt meson build
  
Tu, Lijuan Nov. 3, 2020, 4:30 a.m. UTC | #2
> adapt meson build
> 
> Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>

Applied
  

Patch

diff --git a/tests/TestSuite_packet_capture.py b/tests/TestSuite_packet_capture.py
index 9c2a3097..4b980558 100644
--- a/tests/TestSuite_packet_capture.py
+++ b/tests/TestSuite_packet_capture.py
@@ -825,17 +825,9 @@  class TestPacketCapture(TestCase):
             self.dut.skip_setup = False
             self.dut.build_install_dpdk(self.target)
         # secondary process (dpdk-pdump)
-        self.pdump_dir = self.target_dir + os.sep + \
-            "%s/build/app/pdump/" % self.target
-        cmd = "ls {0} -F | grep '*'".format(self.pdump_dir)
-        exe_files = self.dut.alt_session.send_expect(cmd, "# ").splitlines()
-        if len(exe_files) == 1:
-            self.tool_name = exe_files[0][:-1]
-        else:
-            self.verify(False, "tool name exception !")
+        self.dut_dpdk_pdump_dir = self.dut.apps_name['pdump']
+        self.tool_name = self.dut_dpdk_pdump_dir.split('/')[-1]
         self.session_ex = self.dut.new_session(self.tool_name)
-        self.dut_dpdk_pdump_dir = self.target_dir + os.sep + \
-            "%s/app/%s" % (self.target, self.tool_name)
         self.dpdk_pdump = self.dut_dpdk_pdump_dir + \
             " -v --file-prefix=test -- --pdump "
         self.send_pcap = os.sep.join([self.pdump_log, "scapy_%s_%s_%d.pcap"])