From patchwork Fri Sep 4 08:18:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76528 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 93EF4A04DC; Fri, 4 Sep 2020 10:17:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B4E11C10A; Fri, 4 Sep 2020 10:17:51 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 47436E07 for ; Fri, 4 Sep 2020 10:17:50 +0200 (CEST) IronPort-SDR: YI4vg0/l68MiNHaEqOnAkHgPo3hZbLD8dZsHM9Bja2N/5QTlh9XXyI4do6fDyStBot4k/AgnYe VHBfKqq9LSAw== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="242528905" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="242528905" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:49 -0700 IronPort-SDR: 5XtLj/gR3jlwg9TagTciAGr34KANciL2vMZ7OTnaCJ0bmICYFAi7SmKFCAwyld1zyyvlBXCApu QprEkqAGdFWg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782797" 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:48 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:40 +0800 Message-Id: <1599207525-22123-33-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 33/38] tests/TestSuite_qinq_filter.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_qinq_filter.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tests/TestSuite_qinq_filter.py b/tests/TestSuite_qinq_filter.py index 560f08d..086abc1 100644 --- a/tests/TestSuite_qinq_filter.py +++ b/tests/TestSuite_qinq_filter.py @@ -75,7 +75,8 @@ class TestQinqFilter(TestCase): self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=.*$/" + "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=n/' config/common_base", "# ", 30) - self.dut.build_install_dpdk(self.target) + self.dut.build_install_dpdk(self.target) + self.path=self.dut.apps_name['test-pmd'] def vlan_send_packet(self, vlans): """ @@ -144,9 +145,9 @@ class TestQinqFilter(TestCase): Enable receipt of dual VLAN packets """ - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 -- -i \ + self.dut.send_expect(r'%s -c %s -n 4 -- -i \ --portmask=%s --port-topology=loop \ - --rxq=4 --txq=4 --disable-rss' % (self.target, self.coreMask, self.portMask), + --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, self.portMask), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("vlan set strip on %s" % dutRxPortId, "testpmd> ") @@ -166,9 +167,9 @@ class TestQinqFilter(TestCase): """ qinq filter packet received by assign PF queues """ - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 -- -i \ + self.dut.send_expect(r'%s -c %s -n 4 -- -i \ --portmask=%s --port-topology=loop \ - --rxq=4 --txq=4 --disable-rss' % (self.target, self.coreMask, self.portMask), + --rxq=4 --txq=4 --disable-rss' % (self.path, self.coreMask, self.portMask), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -202,10 +203,10 @@ class TestQinqFilter(TestCase): vf0_session = self.dut.new_session('qinq_filter') vf1_session = self.dut.new_session('qinq_filter') - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + self.dut.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=pf -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), + % (self.path, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -219,16 +220,16 @@ class TestQinqFilter(TestCase): # out vlan 3, inner vlan 4094 packet will received by pf queue 1 self.dut.send_expect(r'flow create 0 ingress pattern eth / vlan tci is 3 / vlan tci is 4094 / end actions pf / queue index 1 / end', "testpmd> ") - vf0_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf0_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf0 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[0]), + % (self.path, self.coreMask, vf_list[0]), "testpmd> ", 30) - vf1_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf1_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf1 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[1]), + % (self.path, self.coreMask, vf_list[1]), "testpmd>", 30) for session_name in [vf0_session, vf1_session]: session_name.send_expect("set fwd rxonly", "testpmd> ") @@ -271,10 +272,10 @@ class TestQinqFilter(TestCase): vf0_session = self.dut.new_session('qinq_filter') vf1_session = self.dut.new_session('qinq_filter') - self.dut.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + self.dut.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=pf -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), + % (self.path, self.coreMask, self.dut.ports_info[dutRxPortId]['pci']), "testpmd> ", 30) self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("set fwd rxonly", "testpmd> ") @@ -291,16 +292,16 @@ class TestQinqFilter(TestCase): self.dut.send_expect('vlan set outer tpid 0x88a8 0', "testpmd") - vf0_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf0_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf0 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[0]), + % (self.path, self.coreMask, vf_list[0]), "testpmd> ", 30) - vf1_session.send_expect(r'./%s/app/testpmd -c %s -n 4 \ + vf1_session.send_expect(r'%s -c %s -n 4 \ --socket-mem=1024,1024 --file-prefix=vf1 -w %s -- -i --port-topology=loop \ --rxq=4 --txq=4 --disable-rss' - % (self.target, self.coreMask, vf_list[1]), + % (self.path, self.coreMask, vf_list[1]), "testpmd>", 30) for session_name in [vf0_session, vf1_session]: session_name.send_expect("set fwd rxonly", "testpmd> ")