From a8b2beedf684f0200e252efe9ba5fad2665b2a36 Mon Sep 17 00:00:00 2001 From: Glenn Washburn Date: Wed, 19 Nov 2025 13:11:35 -0600 Subject: [PATCH] Revert "tests: Remove -w param from mkfs.hfsplus command" The original commit removes testing of GRUB's support for HFS+ wrapping and replaces it with testing that is an exact duplicate of another test, namely HFS+ without wrapping. To start, the change is misleading in that it suggests that the testing of HFS+ wrapping is still taking place, when it is not. If it was desired to remove support for testing the HFS+ wrapping, then the test should have been removed entirely. Second, having a series of tests that are exactly the same is just a waste of testing resources. And third, the justification for the change is nonsensical. Just because a required program may not have a required feature on a particular distro is not a reason that a test should be removed. Reducing test coverage because some distros do not have the tools GRUB needs to run certain tests goes against the testing priority to have test coverage be as broad as possible. The fact is that Debian, the officially supported distro for running the tests, does have a mkfs.hfsplus that supports the -w parameter. This reverts commit 2bc0929a2 (tests: Remove -w param from mkfs.hfsplus command). Signed-off-by: Glenn Washburn Reviewed-by: Daniel Kiper --- tests/util/grub-fs-tester.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in index bfb7b0553..7199322c6 100644 --- a/tests/util/grub-fs-tester.in +++ b/tests/util/grub-fs-tester.in @@ -735,7 +735,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do "mkfs.hfsplus" -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}" dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x468)) conv=notrunc count=8 ;; x"hfsplus_wrap") - "mkfs.hfsplus" -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}" + "mkfs.hfsplus" -w -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}" dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x468)) conv=notrunc count=8 MOUNTFS="hfsplus";; x"hfsplus_casesens")