tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/util/grub-fs-tester: Fix EROFS label tests in grub-fs-tester

Browse Source 
mkfs.erofs with version < 1.6 does not support the -L option.
Let's detect the version of mkfs.erofs and skip the label tests
if it is not supported.

Suggested-by: Glenn Washburn <development@efficientek.com>
Signed-off-by: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Yifan Zhao 2024-06-12 15:28:41 +08:00 committed by Daniel Kiper
parent d41c64811d
commit b990df0bef
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/util/grub-fs-tester.in
View File

@ -595,6 +595,12 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
x"cpio_"* | x"tarfs" | x"squash4_"* | x"minix" | x"minix2" \ x"cpio_"* | x"tarfs" | x"squash4_"* | x"minix" | x"minix2" \
| x"minix3" | xreiserfs_old) | x"minix3" | xreiserfs_old)
NOFSLABEL=y;; NOFSLABEL=y;;
x"erofs_"*)
MKFS_EROFS_VERSION=$(mkfs.erofs -V 2>/dev/null | tr ' ' '\n' | grep '^[0-9]')
# check if the version is at least 1.6
if [ $(sort -V <(echo "$MKFS_EROFS_VERSION") <(echo "1.6") | head -n 1) != "1.6" ]; then
NOFSLABEL=y
fi
esac esac
PDIRCOMPNUM=210 PDIRCOMPNUM=210
@ -1121,16 +1127,34 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE
mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;; mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;;
x"erofs_compact") x"erofs_compact")
echo mkfs.erofs -Eforce-inode-compact -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW" cmd="mkfs.erofs"
mkfs.erofs -Eforce-inode-compact -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW" if [ x"$NOFSLABEL" != xy ]; then
cmd="$cmd -L \"$FSLABEL\""
fi
cmd="$cmd -Eforce-inode-compact ${FSIMAGEP}0.img $MNTPOINTRW"
echo $cmd
eval $cmd
unset cmd
;; ;;
x"erofs_extended") x"erofs_extended")
echo mkfs.erofs -Eforce-inode-extended -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW" cmd="mkfs.erofs"
mkfs.erofs -Eforce-inode-extended -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW" if [ x"$NOFSLABEL" != xy ]; then
cmd="$cmd -L \"$FSLABEL\""
fi
cmd="$cmd -Eforce-inode-extended ${FSIMAGEP}0.img $MNTPOINTRW"
echo $cmd
eval $cmd
unset cmd
;; ;;
x"erofs_chunk") x"erofs_chunk")
echo mkfs.erofs --chunksize=1048576 -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW" cmd="mkfs.erofs"
mkfs.erofs --chunksize=1048576 -L "$FSLABEL" "${FSIMAGEP}0.img" "$MNTPOINTRW" if [ x"$NOFSLABEL" != xy ]; then
cmd="$cmd -L \"$FSLABEL\""
fi
cmd="$cmd --chunksize=1048576 ${FSIMAGEP}0.img $MNTPOINTRW"
echo $cmd
eval $cmd
unset cmd
;; ;;
x"bfs") x"bfs")
sleep 1 sleep 1