Re: [PATCH] Use grub-file instead of mbchk to test multiboot header

[Samuel Thibault]

Applied, thanks!

Flavio Cruz, le ven. 06 janv. 2023 00:24:38 -0500, a ecrit:
> mbchk is not part of grub2 and only available on grub-legacy.
> ---
>  tests/Makefrag.am                          | 2 +-
>  tests/configfrag.ac                        | 2 +-
>  tests/{test-mbchk.in => test-multiboot.in} | 8 ++++----
>  3 files changed, 6 insertions(+), 6 deletions(-)
>  rename tests/{test-mbchk.in => test-multiboot.in} (81%)
> 
> diff --git a/tests/Makefrag.am b/tests/Makefrag.am
> index 16d9677d..646cf513 100644
> --- a/tests/Makefrag.am
> +++ b/tests/Makefrag.am
> @@ -21,4 +21,4 @@
>  #
>  
>  TESTS += \
> -     tests/test-mbchk
> +     tests/test-multiboot
> diff --git a/tests/configfrag.ac b/tests/configfrag.ac
> index 1c00fbb2..55c6da62 100644
> --- a/tests/configfrag.ac
> +++ b/tests/configfrag.ac
> @@ -20,7 +20,7 @@ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
> USA.
>  # Tests.
>  #
>  
> -AC_CONFIG_FILES([tests/test-mbchk], [chmod +x tests/test-mbchk])
> +AC_CONFIG_FILES([tests/test-multiboot], [chmod +x tests/test-multiboot])
>  
>  dnl Local Variables:
>  dnl mode: autoconf
> diff --git a/tests/test-mbchk.in b/tests/test-multiboot.in
> similarity index 81%
> rename from tests/test-mbchk.in
> rename to tests/test-multiboot.in
> index a04a00eb..20ab3309 100644
> --- a/tests/test-mbchk.in
> +++ b/tests/test-multiboot.in
> @@ -2,7 +2,7 @@
>  
>  # Test if the kernel image complies with the multiboot specification.
>  
> -# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
> +# Copyright (C) 2023 Free Software Foundation, Inc.
>  
>  # This program is free software; you can redistribute it and/or modify it
>  # under the terms of the GNU General Public License as published by the
> @@ -18,10 +18,10 @@
>  # with this program; if not, write to the Free Software Foundation, Inc.,
>  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
>  
> -if mbchk --version > /dev/null 2>&1
> -then mbchk gnumach
> +if grub-file --help > /dev/null 2>&1
> +then grub-file --is-x86-multiboot gnumach
>  else
> -  # `mbchk' is not available -- ignore this test.
> +  # `grub-file' is not available -- ignore this test.
>    exit 77
>  fi
>  
> -- 
> 2.35.1
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.