From patchwork Fri Sep 18 09:09:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, XiX" X-Patchwork-Id: 78083 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 81AC1A04C9; Fri, 18 Sep 2020 11:07:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 274421D94F; Fri, 18 Sep 2020 11:07:52 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id DA26F1D948 for ; Fri, 18 Sep 2020 11:07:50 +0200 (CEST) IronPort-SDR: 07FtfpvUVeFdiiPF83REMb+JfziC4nMEM62cRJ9HD+RUFjxzW5PRjEuDIQ/DGs0IE19NV2cWMO D/qdDvGdq5Ww== X-IronPort-AV: E=McAfee;i="6000,8403,9747"; a="244729806" X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="244729806" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 02:07:50 -0700 IronPort-SDR: m/RwoycfWCWFz1GX9W2UHdvO1k0E80BoXqQcA0E0oDp3aBsONeCJeRkhFEnlW6i2SSMd7eH0En fqZ0fF8fiGeQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="339736344" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.182.150]) by fmsmga002.fm.intel.com with ESMTP; 18 Sep 2020 02:07:48 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Fri, 18 Sep 2020 17:09:21 +0800 Message-Id: <1600420161-16541-1-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command support meson 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" update scipts set command support meson Signed-off-by: xizhan4x Tested-by: Zhang, XiX --- tests/TestSuite_nvgre.py | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py index e81b370..83a055b 100644 --- a/tests/TestSuite_nvgre.py +++ b/tests/TestSuite_nvgre.py @@ -362,9 +362,9 @@ class TestNvgre(TestCase): """ # this feature only enable in FVL now if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_BASE-T", "cavium_a063", "cavium_a064", "carlsville"]: - self.compile_switch = 'CONFIG_RTE_LIBRTE_I40E_INC_VECTOR' + self.compile_switch = 'RTE_LIBRTE_I40E_INC_VECTOR' elif self.nic in ["sageville", "sagepond"]: - self.compile_switch = 'CONFIG_RTE_IXGBE_INC_VECTOR' + self.compile_switch = 'RTE_IXGBE_INC_VECTOR' elif self.nic in ["columbiaville_25g","columbiaville_100g"]: print("CVL support default none VECTOR") else: @@ -627,13 +627,9 @@ class TestNvgre(TestCase): print("CVL support default none VECTOR") src_vec_model = 'n' else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model == 'y': - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=n/' config/common_base" % self.compile_switch, "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) + self.dut.set_build_options({f'{self.compile_switch}': 'y'}) + self.dut.skip_setup = False + self.dut.build_install_dpdk(self.target) # check no nvgre packet self.nvgre_detect(outer_l3_type = "IPv6", outer_ip_proto=0xFF) @@ -651,15 +647,10 @@ class TestNvgre(TestCase): self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", outer_vlan=1, inner_vlan=1) if self.nic in ["columbiaville_25g","columbiaville_100g"]: print("CVL support default none VECTOR") - src_vec_model = 'n' else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model != dst_vec_model: - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) + self.dut.set_build_options({f'{self.compile_switch}': 'y'}) + self.dut.skip_setup = False + self.dut.build_install_dpdk(self.target) def test_nvgre_ipv6_checksum_offload(self): # check nvgre packet + inner IPv6 + inner L4 invalid @@ -702,13 +693,9 @@ class TestNvgre(TestCase): print("CVL support default none VECTOR") src_vec_model = 'n' else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model == 'y': - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=n/' config/common_base" % self.compile_switch, "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) + self.dut.set_build_options({f'{self.compile_switch}': 'y'}) + self.dut.skip_setup = False + self.dut.build_install_dpdk(self.target) # check no nvgre packet self.nvgre_detect(outer_ip_proto=0xFF) @@ -724,15 +711,10 @@ class TestNvgre(TestCase): self.nvgre_detect(outer_vlan=1, inner_vlan=1) if self.nic in ["columbiaville_25g","columbiaville_100g"]: print("CVL support default none VECTOR") - src_vec_model = 'n' else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model != dst_vec_model: - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) + self.dut.set_build_options({f'{self.compile_switch}': 'y'}) + self.dut.skip_setup = False + self.dut.build_install_dpdk(self.target) def test_tunnel_filter(self): # verify tunnel filter feature