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

tests: Only test MINIX3 volumes of 1 KiB block size

Browse Source 
Apparently there used to be a -B option for mkfs.minix to create a volume
with a specified block size. This version is hard to come by and does not
appear to be available in Debian distributions. So, remove support for
testing a variety of blocks sizes for MINIX3. This allows the MINIX tests
to run because they were being skipped due to not finding a mkfs.minix with
the -B option.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn 2021-09-17 23:03:59 +00:00 committed by Daniel Kiper
parent e88fbbb82e
commit 18a71132e9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/minixfs_test.in
View File

@ -25,11 +25,6 @@ if ! mkfs.minix -h | grep -- -3 > /dev/null; then
exit 77
fi
if ! mkfs.minix -h | grep -- -B > /dev/null; then
echo "mkfs.minix doesn't support variable block size; cannot test minix*fs."
exit 77
fi
"@builddir@/grub-fs-tester" minix
"@builddir@/grub-fs-tester" minix2
"@builddir@/grub-fs-tester" minix3

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

@ -201,7 +201,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
# OS LIMITATION: Linux rejects non-power-of-two blocks.
# OS LIMITATION: Linux rejects > 4096.
MINBLKSIZE=1024
MAXBLKSIZE=4096;;
MAXBLKSIZE=1024;;
esac
if test "$BLKSTEP" -eq 0; then
blksizes="$(powrange "$MINBLKSIZE" "$MAXBLKSIZE")"
@ -697,7 +697,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
"mkfs.minix" -v "${MOUNTDEVICE}"
MOUNTFS="minix";;
x"minix3")
"mkfs.minix" -B $BLKSIZE -3 "${MOUNTDEVICE}"
"mkfs.minix" -3 "${MOUNTDEVICE}"
MOUNTFS="minix";;
x"ntfs"*)
"mkfs.ntfs" -s "$SECSIZE" -c "$BLKSIZE" -L "$FSLABEL" -Q -q "${MOUNTDEVICE}"