From: Glenn Washburn Date: Sun, 14 May 2023 04:52:56 +0000 (-0500) Subject: tests/util/grub-fs-tester: Avoid failing some file system tests due to file system... X-Git-Tag: grub-2.12-rc1~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee57bd277f046f19ca352b5e883bea1034734b4;p=thirdparty%2Fgrub.git tests/util/grub-fs-tester: Avoid failing some file system tests due to file system filling up On some systems /usr/share/dict/american-english can be larger than the available space on the filesystem being tested (e.g. vfat12a). This causes a failure of the filesystem test and is not a real test failure. Instead, use dd to copy at most 1 MiB 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 Reviewed-by: Daniel Kiper --- diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in index 1030098b4..ea8b2d1f6 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"