[dts] [PATCH V1]framework/pmd_output: fix regex to match file_prefix argument

[dts] [PATCH V1]framework/pmd_output: fix regex to match file_prefix argument

[Xiao Qimai]

testpmd can accept eal parameter file_prefix without equal mark

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 framework/pmd_output.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/pmd_output.py b/framework/pmd_output.py
index 03183ce..762f335 100644
--- a/framework/pmd_output.py
+++ b/framework/pmd_output.py
@@ -110,7 +110,7 @@ class PmdOutput():
         :return:
         """
         re_w_pci_str = '\s?-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-w\\s+.+?:.+?\\..+?[,.*=\d+]?\s'
-        re_file_prefix_str = '--file-prefix=.+?\s'
+        re_file_prefix_str = '--file-prefix[=\s+].+\s'
         re_b_pci_str = '\s?-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-b\\s+.+?:.+?\\..+?[,.*=\d+]?\s'
         eal_param = eal_param + ' '
         # pci_str_list eg: ['-w   0000:1a:00.0 ', '-w 0000:1a:00.1,queue-num-per-vf=4 ', '-w 0000:aa:bb.1,queue-num-per-vf=4 ']
@@ -139,8 +139,8 @@ class PmdOutput():
 
         file_prefix = ''
         if file_prefix_str:
-            tmp = file_prefix_str[0].split('=')
-            file_prefix = tmp[1].strip()
+            tmp = re.split('(=|\s+)', file_prefix_str[-1].strip())
+            file_prefix = tmp[-1].strip()
 
         other_eal_str = re.sub(re_w_pci_str, '', eal_param)
         other_eal_str = re.sub(re_b_pci_str, '', other_eal_str)
-- 
2.17.1

Re: [dts] [PATCH V1]framework/pmd_output: fix regex to match file_prefix argument

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xiao Qimai
> Sent: Friday, November 15, 2019 1:52 PM
> To: dts@dpdk.org
> Cc: Xiao, QimaiX <qimaix.xiao@intel.com>
> Subject: [dts] [PATCH V1]framework/pmd_output: fix regex to match
> file_prefix argument
> 
> testpmd can accept eal parameter file_prefix without equal mark
> 
> Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
> ---
>  framework/pmd_output.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/framework/pmd_output.py b/framework/pmd_output.py index
> 03183ce..762f335 100644
> --- a/framework/pmd_output.py
> +++ b/framework/pmd_output.py
> @@ -110,7 +110,7 @@ class PmdOutput():
>          :return:
>          """
>          re_w_pci_str = '\s?-w\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-
> w\\s+.+?:.+?\\..+?[,.*=\d+]?\s'
> -        re_file_prefix_str = '--file-prefix=.+?\s'
> +        re_file_prefix_str = '--file-prefix[=\s+].+\s'
>          re_b_pci_str = '\s?-b\\s+.+?:.+?:.+?\\..+?[,.*=\d+]?\s|\s?-
> b\\s+.+?:.+?\\..+?[,.*=\d+]?\s'
>          eal_param = eal_param + ' '
>          # pci_str_list eg: ['-w   0000:1a:00.0 ', '-w 0000:1a:00.1,queue-num-per-
> vf=4 ', '-w 0000:aa:bb.1,queue-num-per-vf=4 ']
> @@ -139,8 +139,8 @@ class PmdOutput():
> 
>          file_prefix = ''
>          if file_prefix_str:
> -            tmp = file_prefix_str[0].split('=')
> -            file_prefix = tmp[1].strip()
> +            tmp = re.split('(=|\s+)', file_prefix_str[-1].strip())
> +            file_prefix = tmp[-1].strip()
> 
>          other_eal_str = re.sub(re_w_pci_str, '', eal_param)
>          other_eal_str = re.sub(re_b_pci_str, '', other_eal_str)
> --
> 2.17.1