[PATCH] tests/util/grub-fs-tester: Avoid failing some file system tests due to file system filling up

[PATCH] tests/util/grub-fs-tester: Avoid failing some file system tests due to file system filling up

[Glenn Washburn]

On some systems /usr/share/dict/american-english can be larger than the
available space on the filesystem being tested (eg. vfat12a). This
causes a failure of the filesystem test and is not a real test failure.
Instead, use dd to copy at most 1M of data to the filesystem, which is
enough for our purposes and will not fill any of the tested filesystems.

Signed-off-by: Glenn Washburn <development@efficientek.com>
---
 tests/util/grub-fs-tester.in | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index 9cc6b581197b..a235ff9cda29 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -1058,15 +1058,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
 	    if [ x$CASESENS = xy ]; then
 		"$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/cAsE"
 	    fi
-	    if (test x$fs = xvfat12a || test x$fs = xmsdos12a) && test x$BLKSIZE = x131072; then
-		# With this config there isn't enough space for full copy.
-		# Copy as much as we can
-		cp "${CFILESRC}" "$MNTPOINTRW/$OSDIR/${CFILE}" &> /dev/null;
-	    else
-
-		cp "${CFILESRC}" "$MNTPOINTRW/$OSDIR/${CFILE}";
-
-	    fi
+	    dd if="${CFILESRC}" of="$MNTPOINTRW/$OSDIR/${CFILE}" bs=1024 count=1024
 
 	    if [ x$NOSYMLINK != xy ]; then
 		ln -s "$BASEFILE" "$MNTPOINTRW/$OSDIR/$BASESYM"
-- 
2.34.1

Re: [PATCH] tests/util/grub-fs-tester: Avoid failing some file system tests due to file system filling up

[Daniel Kiper]

On Sat, May 13, 2023 at 11:52:56PM -0500, Glenn Washburn wrote:
> On some systems /usr/share/dict/american-english can be larger than the
> available space on the filesystem being tested (eg. vfat12a). This
> causes a failure of the filesystem test and is not a real test failure.
> Instead, use dd to copy at most 1M of data to the filesystem, which is
> enough for our purposes and will not fill any of the tested filesystems.
>
> Signed-off-by: Glenn Washburn <development@efficientek.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel