test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command support meson
@ 2020-09-18  9:09 xizhan4x
  2020-09-18  9:09 ` Zhang, XiX
  2020-09-22  7:58 ` Ma, LihongX
  0 siblings, 2 replies; 3+ messages in thread
From: xizhan4x @ 2020-09-18  9:09 UTC (permalink / raw)
  To: dts; +Cc: xizhan4x

update scipts set command support meson

Signed-off-by: xizhan4x <xix.zhang@intel.com>
---
 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
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command support meson
  2020-09-18  9:09 [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command support meson xizhan4x
@ 2020-09-18  9:09 ` Zhang, XiX
  2020-09-22  7:58 ` Ma, LihongX
  1 sibling, 0 replies; 3+ messages in thread
From: Zhang, XiX @ 2020-09-18  9:09 UTC (permalink / raw)
  To: dts

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

Tested-by: Zhang, XiX <xix.zhang@intel.com>

> -----Original Message-----
> From: Zhang, XiX
> Sent: Friday, September 18, 2020 5:09 PM
> To: dts@dpdk.org
> Cc: Zhang, XiX <xix.zhang@intel.com>
> Subject: [dts][PATCH V1] tests/TestSuite_nvgre:update scipts set command
> support meson


[-- Attachment #2: TestNvgre.log --]
[-- Type: application/octet-stream, Size: 1406596 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command support meson
  2020-09-18  9:09 [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command support meson xizhan4x
  2020-09-18  9:09 ` Zhang, XiX
@ 2020-09-22  7:58 ` Ma, LihongX
  1 sibling, 0 replies; 3+ messages in thread
From: Ma, LihongX @ 2020-09-22  7:58 UTC (permalink / raw)
  To: Zhang, XiX, dts; +Cc: Zhang, XiX



> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of xizhan4x
> Sent: Friday, September 18, 2020 5:09 PM
> To: dts@dpdk.org
> Cc: Zhang, XiX <xix.zhang@intel.com>
> Subject: [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command
> support meson
> 
> update scipts set command support meson
> 
> Signed-off-by: xizhan4x <xix.zhang@intel.com>
> ---
>  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)
> 

Hi, xi
I think the original code is set the config 'RTE_IXGBE_INC_VECTOR' to n, but your modify now set it to y
Can you double check it ?

BTW: please do not delete the command of modify file common_base, we will delete them uniformly.

Regards,
Ma,lihong

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-22  7:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-18  9:09 [dts] [PATCH V1] tests/TestSuite_nvgre:update scipts set command support meson xizhan4x
2020-09-18  9:09 ` Zhang, XiX
2020-09-22  7:58 ` Ma, LihongX

test suite reviews and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ https://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git