[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] tests: Only test minix3 volumes of 1k block size
From: |
Glenn Washburn |
Subject: |
[PATCH 05/10] tests: Only test minix3 volumes of 1k block size |
Date: |
Fri, 17 Sep 2021 23:03:59 +0000 |
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>
---
tests/minixfs_test.in | 5 -----
tests/util/grub-fs-tester.in | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/tests/minixfs_test.in b/tests/minixfs_test.in
index 3b16a4de0..437d92df6 100644
--- a/tests/minixfs_test.in
+++ b/tests/minixfs_test.in
@@ -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
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index f4d9f161b..96b204590 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -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}"
--
2.32.0
- [PATCH 00/10] More test fixes/improvements, Glenn Washburn, 2021/09/17
- [PATCH 01/10] tests: Rename variable filtime -> filetime as its meant to be, Glenn Washburn, 2021/09/17
- [PATCH 02/10] tests: mkreiserfs only supports 4096 block size, Glenn Washburn, 2021/09/17
- [PATCH 04/10] tests: mkfs.btrfs now supports only 4k sector sizes and above, Glenn Washburn, 2021/09/17
- [PATCH 03/10] tests: Disable reiserfs tests for old format because newer kernels do not support them, Glenn Washburn, 2021/09/17
- [PATCH 05/10] tests: Only test minix3 volumes of 1k block size,
Glenn Washburn <=
- [PATCH 06/10] tests: Change FAT volume label to be with in the valid character range, Glenn Washburn, 2021/09/17
- [PATCH 07/10] tests: Skip hfs test only when mac_roman module is not loaded and not loadable, Glenn Washburn, 2021/09/17
- [PATCH 08/10] grub-shell: Boot PowerPC using PMU instead of CUDA for power management, Glenn Washburn, 2021/09/17
- [PATCH 09/10] tests: Output list of devices when partmap fails, Glenn Washburn, 2021/09/17
- [PATCH 10/10] tests: Do not delete filesystem images on error, Glenn Washburn, 2021/09/17