Patchwork [11/11] scripts: update check-qerror.sh

login
register
mail settings
Submitter Luiz Capitulino
Date July 25, 2012, 4:54 p.m.
Message ID <1343235256-26310-12-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/173218/
State New
Headers show

Comments

Luiz Capitulino - July 25, 2012, 4:54 p.m.
The qerror.h file doesn't contain the macros anymore, the script should
check qapi-schema-errors.json instead.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 scripts/check-qerror.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Markus Armbruster - July 26, 2012, 11:57 a.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> The qerror.h file doesn't contain the macros anymore, the script should
> check qapi-schema-errors.json instead.
>
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  scripts/check-qerror.sh | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/check-qerror.sh b/scripts/check-qerror.sh
> index af7fbd5..e397b4f 100755
> --- a/scripts/check-qerror.sh
> +++ b/scripts/check-qerror.sh
> @@ -16,7 +16,5 @@ check_order() {
>    return 0
>  }
>  
> -check_order 'Definitions in qerror.h must be in alphabetical order:' \
> -            grep '^#define QERR_' qerror.h
> -check_order 'Entries in qerror.c:qerror_table must be in alphabetical order:' \
> -            sed -n '/^static.*qerror_table\[\]/,/^};/s/QERR_/&/gp' qerror.c
> +check_order 'Definitions must be in alphabetical order:' \
> +            grep '^# @' qapi-schema-errors.json

I'd add the new rule in the commit that adds qapi-schema-errors.json,
and drop the old rules in the commit that deletes the old definitions.

Patch

diff --git a/scripts/check-qerror.sh b/scripts/check-qerror.sh
index af7fbd5..e397b4f 100755
--- a/scripts/check-qerror.sh
+++ b/scripts/check-qerror.sh
@@ -16,7 +16,5 @@  check_order() {
   return 0
 }
 
-check_order 'Definitions in qerror.h must be in alphabetical order:' \
-            grep '^#define QERR_' qerror.h
-check_order 'Entries in qerror.c:qerror_table must be in alphabetical order:' \
-            sed -n '/^static.*qerror_table\[\]/,/^};/s/QERR_/&/gp' qerror.c
+check_order 'Definitions must be in alphabetical order:' \
+            grep '^# @' qapi-schema-errors.json