grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] [PATCH] tests: Keep grub-fs-tester ziso9660 from failing for


From: Daniel Kiper
Subject: Re: [PATCH] [PATCH] tests: Keep grub-fs-tester ziso9660 from failing for wrong reasons
Date: Wed, 8 Sep 2021 21:04:45 +0200
User-agent: NeoMutt/20170113 (1.7.2)

On Wed, Sep 08, 2021 at 01:10:55PM +0200, Thomas Schmitt wrote:
> The test for the ability to decompress zisofs encoded files is supposed
> to fail due to the lack of this ability in GRUB. But it fails early with
>   xorriso : FAILURE : -volid: Text too long (1650 > 32)
> because "ziso9660" is not in the list of filesystems which accept at most
> 32 bytes in their FSLABEL. If this is fixed, the test returns false success
> because the xorriso run does not produce any zisofs compressed files. A bug
> in xorriso causes a distracting warning about FSLABEL being too long for
> Joliet. Shortcommings of Joliet cause warnings about symbolic links.

s/links./links too./?

> So add "ziso9660" to the 32-byte FSLABEL list. Fix the xorriso run to

I have an itching to ask you to split this thing into two patches.
Though I am not really convinced doing it. So, feel free to do what
is better here in your opinion...

> produce compressed files which for now cause righteous failure of the test.
> Remove the option to produce a Joliet filesystem tree in order to
> concentrate on testing zisofs decompression.
>
> Signed-off-by: Thomas Schmitt <scdbackup@gmx.net>
> ---
>  tests/util/grub-fs-tester.in | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
> index 4f581b638..a28e07295 100644
> --- a/tests/util/grub-fs-tester.in
> +++ b/tests/util/grub-fs-tester.in
> @@ -318,7 +318,8 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" 
> "$MAXLOGSECSIZE" 1); do
>                   FSLABEL="grub_;/testéтi 
> u😁莽茝кириrewfceniuewruevrewnuuireurevueurnievrewfne";;
>                   # FS LIMITATION: afs and iso9660 label is at most 32 UTF-8 
> characters
>               x"afs" | xiso9660 | xrockridge | xrockridge_joliet\
> -                     | xiso9660_1999 | xrockridge_1999 | 
> xrockridge_joliet_1999)
> +                  | xiso9660_1999 | xrockridge_1999\
> +                  | xrockridge_joliet_1999 | xziso9660)
>                    FSLABEL="gr_;/é莭莽😁кирит u";;
>                   # FS LIMITATION: bfs label is at most 32 UTF-8 characters
>                   # OS LIMITATION: bfs label can't contain ; or /
> @@ -1024,7 +1025,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" 
> "$MAXLOGSECSIZE" 1); do
>                   (cd "$MASTER"; find . | cpio -o -H "$(echo ${fs} | sed 
> 's@^cpio_@@')" > "${FSIMAGEP}0.img" ) ;;
>               x"ziso9660")
>                   FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
> -                 xorriso -compliance rec_mtime -set_filter_r --zisofs -- 
> -zisofs default -as mkisofs $XORRISOFS_CHARSET -iso-level 3 -graft-points -R 
> -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 
> 's/-//g;') -o "${FSIMAGEP}0.img"  -- -set_filter_r --zisofs -- -zisofs 
> default -add /="$MASTER" ;;
> +                 xorriso -compliance rec_mtime -as mkisofs 
> $XORRISOFS_CHARSET -iso-level 3 -graft-points -R -V "$FSLABEL" 
> --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" 
> -- -add /="$MASTER" -- -zisofs default -set_filter_r --zisofs / -- ;;

You described everything in the commit message what you are doing here
except of "-set_filter_r --zisofs -- -zisofs default" games. Could you
explain that too? And if you could not change the order of above mentioned
options it would be nice. Or explain why you change the order.

Daniel



reply via email to

[Prev in Thread] Current Thread [Next in Thread]