From 86d6377f4449d1a2932ba2965e03b74da23ae37b Mon Sep 17 00:00:00 2001 From: Flavio Cruz Date: Fri, 6 Jan 2023 00:24:38 -0500 Subject: Use grub-file instead of mbchk to test multiboot header mbchk is not part of grub2 and only available on grub-legacy. Message-Id: --- tests/Makefrag.am | 2 +- tests/configfrag.ac | 2 +- tests/test-mbchk.in | 30 ------------------------------ tests/test-multiboot.in | 30 ++++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 tests/test-mbchk.in create mode 100644 tests/test-multiboot.in (limited to 'tests') 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-mbchk.in deleted file mode 100644 index a04a00eb..00000000 --- a/tests/test-mbchk.in +++ /dev/null @@ -1,30 +0,0 @@ -#!@SHELL@ - -# Test if the kernel image complies with the multiboot specification. - -# Copyright (C) 2006, 2007 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 -# Free Software Foundation; either version 2, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License along -# 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 -else - # `mbchk' is not available -- ignore this test. - exit 77 -fi - -# Local Variables: -# mode: shell-script -# End: diff --git a/tests/test-multiboot.in b/tests/test-multiboot.in new file mode 100644 index 00000000..20ab3309 --- /dev/null +++ b/tests/test-multiboot.in @@ -0,0 +1,30 @@ +#!@SHELL@ + +# Test if the kernel image complies with the multiboot specification. + +# 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 +# Free Software Foundation; either version 2, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +if grub-file --help > /dev/null 2>&1 +then grub-file --is-x86-multiboot gnumach +else + # `grub-file' is not available -- ignore this test. + exit 77 +fi + +# Local Variables: +# mode: shell-script +# End: -- cgit v1.2.3