[dts] [PATCH] framework: enhance regex for DPDK apps build

[dts] [PATCH] framework: enhance regex for DPDK apps build

[Reshma Pattan]

The below patch added regex enhancements to match latest DPDK build
output which contains '#'. But the patch missed to make same change
at another place.
https://git.dpdk.org/tools/dts/commit/?id=18c537316341ed2ec440b659835f40143ceba8b7

So, this patch extended the same fix to another place in "build_dpdk_apps" method.

CC: BoX.C.Chen@intel.com
CC: ZbigniewX.Sikora@intel.com

Signed-off-by: Sikora ZbigniewX <ZbigniewX.Sikora@intel.com>
Signed-off-by: Reshma Pattan <reshma.pattan@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 0edb38a6..95efad64 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -576,9 +576,9 @@ class DPDKdut(Dut):
             example = 'all'
         else:
             example = '/'.join(folder_info[folder_info.index('examples')+1:])
-        out = self.send_expect("meson configure -Dexamples=%s %s" % (example, self.target), "# ")
+        out = self.send_expect("meson configure -Dexamples=%s %s" % (example, self.target), "[~|~\]]# ")
         assert ("FAILED" not in out), "Compilation error..."
-        out = self.send_expect("ninja -C %s" % self.target, "# ", timeout)
+        out = self.send_expect("ninja -C %s" % self.target, "[~|~\]]# ", timeout)
         assert ("FAILED" not in out), "Compilation error..."
 
         # verify the app build in the config path
-- 
2.17.1

Re: [dts] [PATCH] framework: enhance regex for DPDK apps build

[Chen, BoX C]

Hi Pattan,

Regards,
Chen Bo

> -----Original Message-----
> From: Pattan, Reshma <reshma.pattan@intel.com>
> Sent: April 15, 2021 20:04
> To: dts@dpdk.org
> Cc: Pattan, Reshma <reshma.pattan@intel.com>; Chen, BoX C
> <box.c.chen@intel.com>; Sikora, ZbigniewX <zbigniewx.sikora@intel.com>
> Subject: [dts][PATCH] framework: enhance regex for DPDK apps build
> 
> The below patch added regex enhancements to match latest DPDK build
> output which contains '#'. But the patch missed to make same change at
> another place.
> https://git.dpdk.org/tools/dts/commit/?id=18c537316341ed2ec440b659835f4
> 0143ceba8b7
> 
> So, this patch extended the same fix to another place in "build_dpdk_apps"
> method.
> 

The fix patch has been submited, thank you very much for your attention.
http://mails.dpdk.org/archives/dts/2021-April/013219.html


> CC: BoX.C.Chen@intel.com
> CC: ZbigniewX.Sikora@intel.com
> 
> Signed-off-by: Sikora ZbigniewX <ZbigniewX.Sikora@intel.com>
> Signed-off-by: Reshma Pattan <reshma.pattan@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 0edb38a6..95efad64 100644
> --- a/framework/project_dpdk.py
> +++ b/framework/project_dpdk.py
> @@ -576,9 +576,9 @@ class DPDKdut(Dut):
>              example = 'all'
>          else:
>              example = '/'.join(folder_info[folder_info.index('examples')+1:])
> -        out = self.send_expect("meson configure -Dexamples=%s %s" %
> (example, self.target), "# ")
> +        out = self.send_expect("meson configure -Dexamples=%s %s" %
> + (example, self.target), "[~|~\]]# ")
>          assert ("FAILED" not in out), "Compilation error..."
> -        out = self.send_expect("ninja -C %s" % self.target, "# ", timeout)
> +        out = self.send_expect("ninja -C %s" % self.target, "[~|~\]]#
> + ", timeout)
>          assert ("FAILED" not in out), "Compilation error..."
> 
>          # verify the app build in the config path
> --
> 2.17.1

Re: [dts] [PATCH] framework: enhance regex for DPDK apps build

[Pattan, Reshma]

> -----Original Message-----
> From: Chen, BoX C <box.c.chen@intel.com>
> 
> > -----Original Message-----
> >
> > So, this patch extended the same fix to another place in "build_dpdk_apps"
> > method.
> >
> 
> The fix patch has been submited, thank you very much for your attention.
> http://mails.dpdk.org/archives/dts/2021-April/013219.html
> 
Hi,

Thanks for letting me know, this patch is addressing only ninja regex fix , below is the patch snapshot
What about same at meson build line? If that is needed can you please send the patch for the same.

@@ -578,7 +578,7 @@ class DPDKdut(Dut):
             example = '/'.join(folder_info[folder_info.index('examples')+1:])
         out = self.send_expect("meson configure -Dexamples=%s %s" % (example, self.target), "# ")
         assert ("FAILED" not in out), "Compilation error..."
-        out = self.send_expect("ninja -C %s" % self.target, "# ", timeout)
+        out = self.send_expect("ninja -C %s" % self.target, "[~|~\]]# ", timeout)
         assert ("FAILED" not in out), "Compilation error..."

Thanks,
Reshma