[LTP] [PATCH 1/1] zram: Check properly command dependencies

[Li Wang]

Hi Petr,

On Fri, Jan 15, 2021 at 2:32 AM Petr Vorel <pvorel@suse.cz> wrote:

> Instead of relying that there is mkfs.ext2 as a backup,
> search for supported default.
>
> Always check ext2 (in case there is enough space for btrfs but
> no mkfs.btrfs).
>
> This fixes error when even the default ext2 is not supported:
>
> zram01 5 TINFO: make ext2 filesystem on /dev/zram0
> /opt/ltp/testcases/bin/zram01.sh: line 188: mkfs.ext2: not found
> zram01 5 TFAIL: failed to make ext2 on /dev/zram0
>
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> Hi,
>
> fix to be merged before release.
>
> NOTE: Bug affecting BusyBox needs to be discussed:
> http://lists.linux.it/pipermail/ltp/2021-January/020568.html
>
> Kind regards,
> Petr
>
>  .../kernel/device-drivers/zram/zram_lib.sh    | 21 +++++++++++++++++--
>  1 file changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/testcases/kernel/device-drivers/zram/zram_lib.sh
> b/testcases/kernel/device-drivers/zram/zram_lib.sh
> index 3f4d1d55f..1a611b974 100755
> --- a/testcases/kernel/device-drivers/zram/zram_lib.sh
> +++ b/testcases/kernel/device-drivers/zram/zram_lib.sh
> @@ -178,13 +178,30 @@ zram_swapoff()
>  zram_makefs()
>  {
>         tst_require_cmds mkfs
> +
> +       local default_fs fs
>         local i=0
>
> +       for fs in $zram_filesystems ext2; do
> +               if tst_supported_fs $fs 2> /dev/null; then
> +                       default_fs="$fs"
> +                       break
> +               fi
> +       done
>

This workaround makes some sense but a bit overlap to traverse
 $zram_filesystems.

Maybe we can remove the unsupported filesystems from $zram_filesystems
list via tst_supported_fs and tst_cmd_available, to avoid involving that
additional
variable 'default_fs', then in following test if $zram_filesystems is a
null string
just exit with TCONF directly?



> +
> +       if [ -z "$default_fs" ]; then
> +               tst_res TINFO "supported filesystems"
> +               tst_supported_fs > /dev/null
> +               tst_brk TCONF "missing kernel support or mkfs for all of
> these filesystems: $zram_filesystems"
> +       fi
> +
>         for fs in $zram_filesystems; do
> -               # if requested fs not supported default it to ext2
> -               tst_supported_fs $fs 2> /dev/null || fs=ext2
> +               # use default if requested fs not supported or missing mkfs
> +               tst_supported_fs $fs 2> /dev/null && tst_cmd_available
> mkfs.$fs \
> +                       || fs=$default_fs
>
>                 tst_res TINFO "make $fs filesystem on /dev/zram$i"
> +
>                 mkfs.$fs /dev/zram$i > err.log 2>&1
>                 if [ $? -ne 0 ]; then
>                         cat err.log
> --
> 2.29.2
>
>

-- 
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20210115/32d8530d/attachment.htm>