From patchwork Thu Sep 17 06:09:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 77982 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3FC34A04B6; Thu, 17 Sep 2020 08:07:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 352E21D53E; Thu, 17 Sep 2020 08:07:47 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 3890A1D424 for ; Thu, 17 Sep 2020 08:07:46 +0200 (CEST) IronPort-SDR: EYSQHZziPubuFbcoGv0X3w0tlB7IAko79PHf+gIpxbuPJG9b9WZt57yEXK/BWpshNPqm2+128W gjBiaHiCP3iQ== X-IronPort-AV: E=McAfee;i="6000,8403,9746"; a="147316277" X-IronPort-AV: E=Sophos;i="5.76,435,1592895600"; d="scan'208";a="147316277" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 23:07:45 -0700 IronPort-SDR: wca/Rc6AQykC232yf1dupBkHL1XdFl8zxTDERpRSTa3L1WV840Ionsa+ArWXDXYCrd2VEv18HD 8HpZ+6HYwARA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,435,1592895600"; d="scan'208";a="339331348" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.182.150]) by fmsmga002.fm.intel.com with ESMTP; 16 Sep 2020 23:07:44 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Thu, 17 Sep 2020 14:09:17 +0800 Message-Id: <1600322957-32663-1-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V1] tests/TestSuite_cbdma:Modify the start IOAT path X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Modify the start IOAT path supoort meson build Signed-off-by: xizhan4x Acked-by: Wang, Yinan --- tests/TestSuite_cbdma.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_cbdma.py b/tests/TestSuite_cbdma.py index d7ca3ae..14611f0 100644 --- a/tests/TestSuite_cbdma.py +++ b/tests/TestSuite_cbdma.py @@ -54,7 +54,8 @@ class TestCBDMA(TestCase): self.verify(len(self.dut_ports) >= 2, "Insufficient ports for testing") self.ports_socket = self.dut.get_numa_id(self.dut_ports[0]) self.get_cbdma_ports_info_and_bind_to_dpdk() - out = self.dut.build_dpdk_apps('./examples/ioat/') + out = self.dut.build_dpdk_apps('./examples/ioat') + self.app_path=self.dut.apps_name['ioat'] self.verify('Error' not in out, 'compilation ioat error') def set_up(self): @@ -139,14 +140,17 @@ class TestCBDMA(TestCase): num is 2 ''' # flush other output - self.dut.get_session_output(timeout=1) - cmd_command = './examples/ioat/build/ioatfwd ' + eal_params + \ + self.send_session=self.dut.new_session("new_session") + target = self.app_path.split("/") + self.send_session.send_expect(f"cd {'/'.join(target[0:-1])} ", '# ') + self.send_session.get_session_before(timeout=1) + cmd_command = "./"+target[-1] + eal_params + \ '-- -p %s -q %d %s -c %s' % (hex(port_info), self.cbdma_ioat_dev_num/self.cbdma_nic_dev_num, mac_info, self.cbdma_copy_mode) - self.dut.send_expect(cmd_command, 'ioatfwd,') + self.send_session.send_expect(cmd_command, f'{target[-1].strip()},') time.sleep(1) - out = self.dut.get_session_output(timeout=1) + out = self.send_session.get_session_before(timeout=1) thread_num = 2 if self.cbdma_cores_num > 2 else 1 o_thread_info = 'Worker Threads = %d' % thread_num o_copy_info = 'Copy Mode = %s' % self.cbdma_copy_mode @@ -210,7 +214,7 @@ class TestCBDMA(TestCase): """ Check stats of ioat app, each ioat channel can enqueue packets """ - out = self.dut.get_session_output(timeout=2) + out = self.send_session.get_session_before(timeout=2) index = out.rfind('Statistics for port 0') out = out[index:] data_info = re.findall('successful_enqueues:\s*(\d*)', out)