From patchwork Fri Sep 4 08:18:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76530 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 DB05EA04B1; Fri, 4 Sep 2020 10:17:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D17FC1C133; Fri, 4 Sep 2020 10:17:55 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 86D891C127 for ; Fri, 4 Sep 2020 10:17:54 +0200 (CEST) IronPort-SDR: dp0WDB7s+YvFv2PW9BWousmGifDJI22QcaCIMyk0k1Pje9QSQ7H/RDsFZbUTDV4G+dTs2M7res l5LHPdY8lnFw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="155106753" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="155106753" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:53 -0700 IronPort-SDR: LgsL+AOUtiV+3tlbw8bDoN3KcqOOs4qqqQ+k2VYJzzMU+OG++L5xXeOhQyqR1A6tN9mbFMGwN3 f29TBBurcQdg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782811" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.182.150]) by orsmga002.jf.intel.com with ESMTP; 04 Sep 2020 01:17:50 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:42 +0800 Message-Id: <1599207525-22123-35-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599207525-22123-1-git-send-email-xix.zhang@intel.com> References: <1599207525-22123-1-git-send-email-xix.zhang@intel.com> Subject: [dts] [dts 35/38] tests/TestSuite_softnic.py:support meson build 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" Signed-off-by: xizhan4x --- tests/TestSuite_softnic.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_softnic.py b/tests/TestSuite_softnic.py index c6ba6b9..dee163e 100644 --- a/tests/TestSuite_softnic.py +++ b/tests/TestSuite_softnic.py @@ -75,7 +75,8 @@ class TestSoftnic(TestCase): self.dut.session.copy_file_to(self.firmware, self.root_path) self.dut.session.copy_file_to(self.tm_firmware, self.root_path) self.dut.session.copy_file_to(self.nat_firmware, self.root_path) - self.cmd = "./%s/app/testpmd -c 0x7 -s 0x4 -n 4 --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086' -- -i --forward-mode=softnic --portmask=0x2" + self.path=self.dut.apps_name['test-pmd'] + self.cmd = "%s -c 0x7 -s 0x4 -n 4 --vdev 'net_softnic0,firmware=/tmp/%s,cpu_id=1,conn_port=8086' -- -i --forward-mode=softnic --portmask=0x2" # get dts output path if self.logger.log_path.startswith(os.sep): self.output_path = self.logger.log_path @@ -106,7 +107,7 @@ class TestSoftnic(TestCase): # 10G nic pps(M) expect_pps = [14, 8, 4, 2, 1, 0.9, 0.8] - self.dut.send_expect(self.cmd % (self.target, 'firmware.cli'), "testpmd>", timeout=300) + self.dut.send_expect(self.cmd % (self.path, 'firmware.cli'), "testpmd>", timeout=300) self.dut.send_expect("set fwd macswap", "testpmd>") self.dut.send_expect("start", "testpmd>") rx_port = self.tester.get_local_port(0) @@ -132,7 +133,7 @@ class TestSoftnic(TestCase): def test_perf_shaping_for_pipe(self): self.change_config_file('tm_firmware.cli') - self.dut.send_expect(self.cmd % (self.target, 'tm_firmware.cli'), "testpmd> ", timeout=800) + self.dut.send_expect(self.cmd % (self.path, 'tm_firmware.cli'), "testpmd> ", timeout=800) self.dut.send_expect("set fwd macswap", "testpmd>") self.dut.send_expect("start", "testpmd>") rx_port = self.tester.get_local_port(0) @@ -169,7 +170,7 @@ class TestSoftnic(TestCase): for t in pkt_type: for i in range(2): self.dut.send_expect("sed -i -e '12c table action profile AP0 ipv4 offset 270 fwd nat %s proto %s' %s" % (pkt_location[i], t, self.root_path + 'nat_firmware.cli'), "#") - self.dut.send_expect(self.cmd % (self.target, 'nat_firmware.cli'), "testpmd>", timeout=60) + self.dut.send_expect(self.cmd % (self.path, 'nat_firmware.cli'), "testpmd>", timeout=60) self.dut.send_expect("start", "testpmd>") # src ip tcp for j in range(2):