[PATCH 0/2] Tests unifont

[PATCH 0/2] Tests unifont

[Glenn Washburn]

These were suggested by Thomas Schmitt. The first causes an early hard error
in the functional test when unicode.pf2 is not available. And the second
is a documentation change to add the xfonts-unifont to the list of required
debian packages needed for running the tests successfully.

Glenn

Glenn Washburn (2):
  tests: Return hard error for functional test when unicode.pf2 does not
    exist
  docs: Document that the functional test requires the package
    xfonts-unifont

 INSTALL                 | 1 +
 tests/grub_func_test.in | 5 +++++
 2 files changed, 6 insertions(+)

-- 
2.34.1

[PATCH 1/2] tests: Return hard error for functional test when unicode.pf2 does not exist

[Glenn Washburn]

The functional test requires unicode.pf2 to run successfully, so
explicitly have the test return ERROR when its not found.

Signed-off-by: Glenn Washburn <development@efficientek.com>
---
 tests/grub_func_test.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
index c67f9e4225..d43427c568 100644
--- a/tests/grub_func_test.in
+++ b/tests/grub_func_test.in
@@ -3,6 +3,11 @@ set -e
 
 . "@builddir@/grub-core/modinfo.sh"
 
+if [ ! -e "@builddir@/"unicode.pf2 ]; then
+  echo "Functional test requires grub-mkfont support"
+  exit 99
+fi
+
 case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
     # PLATFORM: Max RAM is 256M
     mips-qemu_mips | mipsel-qemu_mips)
-- 
2.34.1

Re: [PATCH 1/2] tests: Return hard error for functional test when unicode.pf2 does not exist

[Thomas Schmitt]

Hi,

On Thu, 16 Feb 2023 01:15:00 -0600, Glenn Washburn
<development@efficientek.com> wrote:
> The functional test requires unicode.pf2 to run successfully, so
> explicitly have the test return ERROR when its not found.
>
> Signed-off-by: Glenn Washburn <development@efficientek.com>
> ---
>  tests/grub_func_test.in | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
> index c67f9e4225..d43427c568 100644
> --- a/tests/grub_func_test.in
> +++ b/tests/grub_func_test.in
> @@ -3,6 +3,11 @@ set -e
>
>  . "@builddir@/grub-core/modinfo.sh"
>
> +if [ ! -e "@builddir@/"unicode.pf2 ]; then
> +  echo "Functional test requires grub-mkfont support"
> +  exit 99
> +fi
> +
>  case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
>      # PLATFORM: Max RAM is 256M
>      mips-qemu_mips | mipsel-qemu_mips)

Tested-by: Thomas Schmitt <scdbackup@gmx.net>


With xfonts-unifont installed, the test gets beyond the grub-mkisofs run
and shows the usual complaints about checksums.

After
  apt-get remove xfonts-unifont
and in the git repo:
  rm unicode.pf2
  ./configure && make
the grub_func_test ends very quickly with:

  Functional test requires grub-mkfont support
  ERROR grub_func_test (exit status: 99)


Have a nice day :)

Thomas

[PATCH 2/2] docs: Document that the functional test requires the package xfonts-unifont

[Glenn Washburn]

Signed-off-by: Glenn Washburn <development@efficientek.com>
---
 INSTALL | 1 +
 1 file changed, 1 insertion(+)

diff --git a/INSTALL b/INSTALL
index 620dcceb48..d1d5a6b88a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -70,6 +70,7 @@ Prerequisites for make-check:
 * xorriso 1.2.9 or later, for grub-mkrescue and grub-shell
 * wamerican, for grub-fs-tester
 * mtools, FAT tools for EFI platforms
+* xfonts-unifont, for the functional tests
 
 * If running a Linux kernel the following modules must be loaded:
   - fuse, loop
-- 
2.34.1

Re: [PATCH 2/2] docs: Document that the functional test requires the package xfonts-unifont

[Thomas Schmitt]

Hi,

On Thu, 16 Feb 2023 01:15:01 -0600, Glenn Washburn
<development@efficientek.com> wrote:
> Document that the functional test requires the package xfonts-unifont
>
> Signed-off-by: Glenn Washburn <development@efficientek.com>
> ---
>  INSTALL | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/INSTALL b/INSTALL
> index 620dcceb48..d1d5a6b88a 100644
> --- a/INSTALL
> +++ b/INSTALL
> @@ -70,6 +70,7 @@ Prerequisites for make-check:
>  * xorriso 1.2.9 or later, for grub-mkrescue and grub-shell
>  * wamerican, for grub-fs-tester
>  * mtools, FAT tools for EFI platforms
> +* xfonts-unifont, for the functional tests
>
>  * If running a Linux kernel the following modules must be loaded:
>    - fuse, loop

Reviewed-by: Thomas Schmitt <scdbackup@gmx.net>


Have a nice day :)

Thomas

Re: [PATCH 2/2] docs: Document that the functional test requires the package xfonts-unifont

[Daniel Kiper]

On Thu, Feb 16, 2023 at 01:15:01AM -0600, Glenn Washburn wrote:
> Signed-off-by: Glenn Washburn <development@efficientek.com>
> ---
>  INSTALL | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/INSTALL b/INSTALL
> index 620dcceb48..d1d5a6b88a 100644
> --- a/INSTALL
> +++ b/INSTALL
> @@ -70,6 +70,7 @@ Prerequisites for make-check:
>  * xorriso 1.2.9 or later, for grub-mkrescue and grub-shell
>  * wamerican, for grub-fs-tester
>  * mtools, FAT tools for EFI platforms
> +* xfonts-unifont, for the functional tests

I would just add it is needed for grub-mkfont build too. I can do it for
you before push...

Otherwise Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> for both patches...

Daniel

Re: [PATCH 2/2] docs: Document that the functional test requires the package xfonts-unifont

[Glenn Washburn]

On Fri, 24 Feb 2023 16:54:28 +0100
Daniel Kiper <dkiper@net-space.pl> wrote:

> On Thu, Feb 16, 2023 at 01:15:01AM -0600, Glenn Washburn wrote:
> > Signed-off-by: Glenn Washburn <development@efficientek.com>
> > ---
> >  INSTALL | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/INSTALL b/INSTALL
> > index 620dcceb48..d1d5a6b88a 100644
> > --- a/INSTALL
> > +++ b/INSTALL
> > @@ -70,6 +70,7 @@ Prerequisites for make-check:
> >  * xorriso 1.2.9 or later, for grub-mkrescue and grub-shell
> >  * wamerican, for grub-fs-tester
> >  * mtools, FAT tools for EFI platforms
> > +* xfonts-unifont, for the functional tests
> 
> I would just add it is needed for grub-mkfont build too. I can do it
> for you before push...

Sure, although, the note that xfonts-unifont is needed for grub-mkfont
makes more sense to me up in the build requirements. The above line is
in a section specifically for make check testing prereqs. I would expect
someone trying to figure out why grub-mkfont is failing to build would
look in the build requirements section.

Glenn

> 
> Otherwise Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> for
> both patches...
> 
> Daniel

Re: [PATCH 2/2] docs: Document that the functional test requires the package xfonts-unifont

[Daniel Kiper]

On Sun, Feb 26, 2023 at 12:56:22AM -0600, Glenn Washburn wrote:
> On Fri, 24 Feb 2023 16:54:28 +0100
> Daniel Kiper <dkiper@net-space.pl> wrote:
>
> > On Thu, Feb 16, 2023 at 01:15:01AM -0600, Glenn Washburn wrote:
> > > Signed-off-by: Glenn Washburn <development@efficientek.com>
> > > ---
> > >  INSTALL | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/INSTALL b/INSTALL
> > > index 620dcceb48..d1d5a6b88a 100644
> > > --- a/INSTALL
> > > +++ b/INSTALL
> > > @@ -70,6 +70,7 @@ Prerequisites for make-check:
> > >  * xorriso 1.2.9 or later, for grub-mkrescue and grub-shell
> > >  * wamerican, for grub-fs-tester
> > >  * mtools, FAT tools for EFI platforms
> > > +* xfonts-unifont, for the functional tests
> >
> > I would just add it is needed for grub-mkfont build too. I can do it
> > for you before push...
>
> Sure, although, the note that xfonts-unifont is needed for grub-mkfont
> makes more sense to me up in the build requirements. The above line is
> in a section specifically for make check testing prereqs. I would expect
> someone trying to figure out why grub-mkfont is failing to build would
> look in the build requirements section.

Good point! I have merged patch as is. If you could make another patch
which adds xfonts-unifont to build requirements that would be perfect.

Daniel