Patchwork [7/9] data: klog.json: Make ArgType a regex to match various similar strings

login
register
mail settings
Submitter Colin King
Date May 14, 2013, 2 p.m.
Message ID <1368540031-28500-8-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/243715/
State Accepted
Headers show

Comments

Colin King - May 14, 2013, 2 p.m.
From: Colin Ian King <colin.king@canonical.com>

Need to match ArgType and ArgType: strings, so make it a regex

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 data/klog.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Keng-Yu Lin - May 20, 2013, 8:29 a.m.
On Tue, May 14, 2013 at 10:00 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Need to match ArgType and ArgType: strings, so make it a regex
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  data/klog.json | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index 6fb3b82..d112b86 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -930,10 +930,10 @@
>      "label": "KlogAcpiControlMethodNoAttachedObject"
>    },
>    {
> -    "compare_mode": "string",
> +    "compare_mode": "regex",
>      "log_level": "LOG_LEVEL_HIGH",
>      "tag": "FWTS_TAG_ACPI",
> -    "pattern": "Invalid ArgType 0x",
> +    "pattern": "Invalid ArgType.*0x",
>      "advice": "An error occurred in getting the next simple argument was expecting one of byte data, work data, dword data, qword data, char list, name or namestring, see acpi_ps_get_next_simple_arg().",
>      "label": "KlogAcpi"
>    },
> --
> 1.8.1.2
>

Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Alex Hung - May 21, 2013, 6:08 a.m.
On 05/14/2013 10:00 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Need to match ArgType and ArgType: strings, so make it a regex
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   data/klog.json | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index 6fb3b82..d112b86 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -930,10 +930,10 @@
>       "label": "KlogAcpiControlMethodNoAttachedObject"
>     },
>     {
> -    "compare_mode": "string",
> +    "compare_mode": "regex",
>       "log_level": "LOG_LEVEL_HIGH",
>       "tag": "FWTS_TAG_ACPI",
> -    "pattern": "Invalid ArgType 0x",
> +    "pattern": "Invalid ArgType.*0x",
>       "advice": "An error occurred in getting the next simple argument was expecting one of byte data, work data, dword data, qword data, char list, name or namestring, see acpi_ps_get_next_simple_arg().",
>       "label": "KlogAcpi"
>     },
>
Acked-by: Alex Hung <alex.hung@canonical.com>

Patch

diff --git a/data/klog.json b/data/klog.json
index 6fb3b82..d112b86 100644
--- a/data/klog.json
+++ b/data/klog.json
@@ -930,10 +930,10 @@ 
     "label": "KlogAcpiControlMethodNoAttachedObject"
   },
   {
-    "compare_mode": "string",
+    "compare_mode": "regex",
     "log_level": "LOG_LEVEL_HIGH",
     "tag": "FWTS_TAG_ACPI",
-    "pattern": "Invalid ArgType 0x",
+    "pattern": "Invalid ArgType.*0x",
     "advice": "An error occurred in getting the next simple argument was expecting one of byte data, work data, dword data, qword data, char list, name or namestring, see acpi_ps_get_next_simple_arg().",
     "label": "KlogAcpi"
   },