From patchwork Fri Sep 4 08:18:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 76515 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 8C852A04C5; Fri, 4 Sep 2020 10:17:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 84DA51C10C; Fri, 4 Sep 2020 10:17:32 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 5A47C1C10C for ; Fri, 4 Sep 2020 10:17:30 +0200 (CEST) IronPort-SDR: 68Gn6fcKySUODoGaksodqt3BB83fnUAV79sOCDoDKNV5jFF6CJyYI6yqRMtfyuwN3KaRzqzBeS 00PbJwcEH0+g== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="175763292" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="175763292" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 01:17:29 -0700 IronPort-SDR: J9STGvkDNCnaYAyi8utyJ57COeK6v0kCdDF8vatQCfhbKwdPhp8qKFvpszSOIGWWo7R7Okdk9x dB3xuk8chPdg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="315782684" 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:28 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 4 Sep 2020 16:18:26 +0800 Message-Id: <1599207525-22123-19-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 19/38] tests/TestSuite_nvgre.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_nvgre.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py index 663968b..e81b370 100644 --- a/tests/TestSuite_nvgre.py +++ b/tests/TestSuite_nvgre.py @@ -384,7 +384,7 @@ class TestNvgre(TestCase): # start testpmd self.pmdout = PmdOutput(self.dut) - + self.path=self.dut.apps_name['test-pmd'] # init port self.dut_rx_port = ports[0] self.dut_tx_port = ports[1] @@ -452,8 +452,8 @@ class TestNvgre(TestCase): """ send nvgre packet and check whether testpmd detect the correct packet type """ - out = self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + out = self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) out = self.dut.send_expect("set fwd rxonly", "testpmd>", 10) self.dut.send_expect("set verbose 1", "testpmd>", 10) @@ -481,8 +481,8 @@ class TestNvgre(TestCase): """ send nvgre packet and check whether receive packet in assigned queue """ - self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) self.dut.send_expect("set fwd rxonly", "testpmd>", 10) self.dut.send_expect("set verbose 1", "testpmd>", 10) @@ -557,8 +557,8 @@ class TestNvgre(TestCase): self.logger.info("chksums_ref:" + str(chksums_default)) # start testpmd with 2queue/1port - out = self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s --enable-rx-cksum" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + out = self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s --enable-rx-cksum" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) # disable vlan filter self.dut.send_expect('vlan set filter off %d' % self.dut_rx_port, "testpmd") @@ -762,8 +762,8 @@ class TestNvgre(TestCase): self.nvgre_filter(filter_type="imac", remove=True) config = NvgreTestConfig(self) # config.outer_mac_dst = self.dut_port_mac - self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" - % (self.target, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) + self.dut.send_expect("%s -c %s -n %d -- -i --disable-rss --rxq=4 --txq=4 --nb-cores=4 --portmask=%s" + % (self.path, self.coremask, self.dut.get_memory_channels(), self.portmask), "testpmd>", 30) out = self.dut.send_expect("tunnel_filter add %d %s %s %s %d nvgre %s %d %d" % (self.dut_rx_port, config.outer_mac_dst, self.invalid_mac, config.inner_ip_dst, vlan_id, filter_type, config.tni, queue_id), "testpmd>", 10) @@ -825,7 +825,7 @@ class TestNvgre(TestCase): core_list = self.dut.get_core_list('1S/%dC/1T' % (self.tunnel_multiqueue * 2), socket=self.ports_socket) core_mask = utils.create_mask(core_list) - command_line = "./%s/app/testpmd -c %s -n %d -- -i --disable-rss --coremask=%s --rxq=4 --txq=4 --portmask=%s" % (self.target, + command_line = "%s -c %s -n %d -- -i --disable-rss --coremask=%s --rxq=4 --txq=4 --portmask=%s" % (self.path, self.all_cores_mask, self.dut.get_memory_channels(), core_mask, self.portmask) @@ -942,8 +942,8 @@ class TestNvgre(TestCase): core_mask = utils.create_mask(core_list) - command_line = "./%s/app/testpmd -c %s -n %d -- -i \ - --disable-rss --coremask=%s --portmask=%s" % (self.target, + command_line = "%s -c %s -n %d -- -i \ + --disable-rss --coremask=%s --portmask=%s" % (self.path, all_cores_mask, self.dut.get_memory_channels(), core_mask, self.portmask) @@ -1000,3 +1000,4 @@ class TestNvgre(TestCase): Run after each test suite. """ pass +