diff mbox series

[V1] iavf_flexible_descriptor:sync plan and case to adapt dpdk code changed

Message ID 20211028180239.4645-1-zhiminx.huang@intel.com (mailing list archive)
State Changes Requested
Headers
Series [V1] iavf_flexible_descriptor:sync plan and case to adapt dpdk code changed |

Checks

Context Check Description
ci/Intel-dts-doc-test success Testing OK
ci/Intel-dts-suite-test success Testing OK

Commit Message

Huang, ZhiminX Oct. 28, 2021, 6:02 p.m. UTC 
  according to dpdk commit daa02b5cddbb8e11b31d41e2bf7bb1ae64dcae2f code changed.
fix code to adapt dpdk changed,and add check function after modify code in case.

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 .../iavf_flexible_descriptor_test_plan.rst    |  2 +-
 tests/TestSuite_iavf_flexible_descriptor.py   | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

Comments

Huang, ZhiminX Oct. 28, 2021, 9:37 a.m. UTC | #1 
> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Friday, October 29, 2021 2:03 AM
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V1] iavf_flexible_descriptor:sync plan and case to adapt
> dpdk code changed
> 
> according to dpdk commit daa02b5cddbb8e11b31d41e2bf7bb1ae64dcae2f
> code changed.
> fix code to adapt dpdk changed,and add check function after modify code in
> case.
> 
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
> ---

Tested-by: Zhimin Huang <zhiminx.huang@intel.com >
David Marchand Oct. 28, 2021, 9:44 a.m. UTC | #2 
On Thu, Oct 28, 2021 at 11:33 AM Zhimin Huang <zhiminx.huang@intel.com> wrote:
>
> according to dpdk commit daa02b5cddbb8e11b31d41e2bf7bb1ae64dcae2f code changed.
> fix code to adapt dpdk changed,and add check function after modify code in case.

Please stop changing DPDK source code in the test tool.


>
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
> ---
>  .../iavf_flexible_descriptor_test_plan.rst    |  2 +-
>  tests/TestSuite_iavf_flexible_descriptor.py   | 23 ++++++++++++++++++-
>  2 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/test_plans/iavf_flexible_descriptor_test_plan.rst b/test_plans/iavf_flexible_descriptor_test_plan.rst
> index d03fbe41..9cf0d713 100644
> --- a/test_plans/iavf_flexible_descriptor_test_plan.rst
> +++ b/test_plans/iavf_flexible_descriptor_test_plan.rst
> @@ -106,7 +106,7 @@ The default DPDK don't support dump flexible descriptor fields, so need to patch
>        (int)mb->nb_segs);
>        ol_flags = mb->ol_flags;
>        +                rte_pmd_ifd_dump_proto_xtr_metadata(mb);
> -      if (ol_flags & PKT_RX_RSS_HASH) {
> +      if (ol_flags & RTE_MBUF_F_RX_RSS_HASH) {
>        MKDUMPSTR(print_buf, buf_size, cur_len,
>        " - RSS hash=0x%x",
>
diff mbox series

Patch

diff --git a/test_plans/iavf_flexible_descriptor_test_plan.rst b/test_plans/iavf_flexible_descriptor_test_plan.rst
index d03fbe41..9cf0d713 100644
--- a/test_plans/iavf_flexible_descriptor_test_plan.rst
+++ b/test_plans/iavf_flexible_descriptor_test_plan.rst
@@ -106,7 +106,7 @@  The default DPDK don't support dump flexible descriptor fields, so need to patch
       (int)mb->nb_segs);
       ol_flags = mb->ol_flags;
       +                rte_pmd_ifd_dump_proto_xtr_metadata(mb);
-      if (ol_flags & PKT_RX_RSS_HASH) {
+      if (ol_flags & RTE_MBUF_F_RX_RSS_HASH) {
       MKDUMPSTR(print_buf, buf_size, cur_len,
       " - RSS hash=0x%x",
 
diff --git a/tests/TestSuite_iavf_flexible_descriptor.py b/tests/TestSuite_iavf_flexible_descriptor.py
index 721dbb53..2da892c1 100644
--- a/tests/TestSuite_iavf_flexible_descriptor.py
+++ b/tests/TestSuite_iavf_flexible_descriptor.py
@@ -51,11 +51,32 @@  class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
             "cp ./app/test-pmd/util.c .",
             r"""sed -i "/if dpdk_conf.has('RTE_NET_IXGBE')/i\if dpdk_conf.has('RTE_NET_ICE')\n\tdeps += ['net_ice', 'net_iavf']\nendif" app/test-pmd/meson.build""",
             "sed -i '/#include <rte_flow.h>/a\#include <rte_pmd_iavf.h>' app/test-pmd/util.c",
-            "sed -i '/if (ol_flags & PKT_RX_RSS_HASH)/i\                rte_pmd_ifd_dump_proto_xtr_metadata(mb);' app/test-pmd/util.c",
+            "sed -i '/if (ol_flags & RTE_MBUF_F_RX_RSS_HASH)/i\                rte_pmd_ifd_dump_proto_xtr_metadata(mb);' app/test-pmd/util.c",
         ]
         [self.dut.send_expect(cmd, "#", 15, alt_session=True) for cmd in cmds]
+        check_point = {
+            "app/test-pmd/meson.build": [
+                "deps += ['net_ice', 'net_iavf']",
+                "if dpdk_conf.has('RTE_NET_ICE')"
+            ],
+            "app/test-pmd/util.c": [
+                "#include <rte_pmd_iavf.h>",
+                "rte_pmd_ifd_dump_proto_xtr_metadata(mb);"
+            ]
+        }
+        for path, cmds in check_point.items():
+            for cmd in cmds:
+                self.check_modify_dpdk_code(cmd, path)
         self.dut.build_install_dpdk(self.dut.target)
 
+    def check_modify_dpdk_code(self, cmd, path):
+        """
+        check dpdk code modify successful
+        """
+        check_cmd = """grep "{}" {}""".format(cmd, path)
+        out = self.dut.send_expect(check_cmd, "# ", 15, alt_session=True, trim_whitespace=False)
+        self.verify(out, "The dpdk code not changed")
+
     def restore_compilation(self):
         """
          Resume editing operation.