[V1] complete DPDK match enhancement

Message ID 20210412170804.2449-1-BoX.C.Chen@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] complete DPDK match enhancement |

Commit Message

Chen, BoX C April 12, 2021, 5:08 p.m. UTC
  The compilation log of DPDK contains '# ', enhanced echo matching.

Signed-off-by: Bo Chen <BoX.C.Chen@intel.com>
---
 framework/project_dpdk.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Tu, Lijuan April 13, 2021, 1:22 a.m. UTC | #1
Applied

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Bo Chen
> Sent: 2021年4月13日 1:08
> To: dts@dpdk.org
> Cc: Chen, BoX C <box.c.chen@intel.com>
> Subject: [dts] [PATCH V1] complete DPDK match enhancement
> 
> The compilation log of DPDK contains '# ', enhanced echo matching.
> 
> Signed-off-by: Bo Chen <BoX.C.Chen@intel.com>
> ---
>  framework/project_dpdk.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index
> af74414..5a7e448 100644
> --- a/framework/project_dpdk.py
> +++ b/framework/project_dpdk.py
> @@ -332,10 +332,10 @@ class DPDKdut(Dut):
> 
>          self.send_expect("rm -rf " + target, "#")
>          out = self.send_expect("CC=%s meson -Denable_kmods=True -
> Dlibdir=lib %s --default-library=%s %s" % (
> -                        toolchain, extra_options, default_library, target), "# ", build_time)
> +                        toolchain, extra_options, default_library,
> + target), "[~|~\]]# ", build_time)
>          assert ("FAILED" not in out), "meson setup failed ..."
> 
> -        out = self.send_expect("ninja -C %s" % target, "# ", build_time)
> +        out = self.send_expect("ninja -C %s" % target, "[~|~\]]# ",
> + build_time)
>          assert ("FAILED" not in out), "ninja complie failed ..."
> 
>          # copy kmod file to the folder same as make
> --
> 2.31.1
  

Patch

diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index af74414..5a7e448 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -332,10 +332,10 @@  class DPDKdut(Dut):
 
         self.send_expect("rm -rf " + target, "#")
         out = self.send_expect("CC=%s meson -Denable_kmods=True -Dlibdir=lib %s --default-library=%s %s" % (
-                        toolchain, extra_options, default_library, target), "# ", build_time)
+                        toolchain, extra_options, default_library, target), "[~|~\]]# ", build_time)
         assert ("FAILED" not in out), "meson setup failed ..."
 
-        out = self.send_expect("ninja -C %s" % target, "# ", build_time)
+        out = self.send_expect("ninja -C %s" % target, "[~|~\]]# ", build_time)
         assert ("FAILED" not in out), "ninja complie failed ..."
 
         # copy kmod file to the folder same as make