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

tests: Make setup errors in grub-fs-tester hard errors

Browse Source 
When a test program fails because it failed to setup the test properly, this
does not indicate a failure in what is attempting to be tested because the
test is never run. So exit with a hard error exit status to note this
difference. This will allow easier detection of tests that are not actually
being run and those that are really failing.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn 2021-10-12 19:40:00 -05:00 committed by Daniel Kiper
parent e024558d46
commit 579575be38
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,8 @@ fs="$1"
GRUBFSTEST="@builddir@/grub-fstest" GRUBFSTEST="@builddir@/grub-fstest"
tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` ||
{ echo "Failed to make temporary directory"; exit 99; }
# xorriso -as mkisofs options to ignore locale when processing file names and # xorriso -as mkisofs options to ignore locale when processing file names and
# FSLABEL. This is especially needed for the conversion to Joliet UCS-2. # FSLABEL. This is especially needed for the conversion to Joliet UCS-2.
@ -277,7 +278,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
done done
if test "$CFILESRC" = "" ; then if test "$CFILESRC" = "" ; then
echo "Couldn't find compressible file" >&2 echo "Couldn't find compressible file" >&2
exit 1 exit 99
fi fi
case x"$fs" in case x"$fs" in
# FS LIMITATION: 8.3 names # FS LIMITATION: 8.3 names
@ -621,7 +622,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
mkdir -p "$MNTPOINTRO" mkdir -p "$MNTPOINTRO"
for i in $(range 0 $((NDEVICES-1)) 1); do for i in $(range 0 $((NDEVICES-1)) 1); do
dd if=/dev/zero of="$FSIMAGEP${i}.img" count=1 bs=1 seek=$((DISKSIZE-1)) &> /dev/null dd if=/dev/zero of="$FSIMAGEP${i}.img" count=1 bs=1 seek=$((DISKSIZE-1)) &> /dev/null
LODEVICE=$(losetup --find --show "$FSIMAGEP${i}.img") LODEVICE=$(losetup --find --show "$FSIMAGEP${i}.img") || exit 99
LODEVICES="$LODEVICES $LODEVICE" LODEVICES="$LODEVICES $LODEVICE"
if test "$i" = 0; then if test "$i" = 0; then
MOUNTDEVICE="$LODEVICE" MOUNTDEVICE="$LODEVICE"
@ -825,7 +826,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
"mkfs.xfs" -m crc=1 -b size=$BLKSIZE -s size=$SECSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;; "mkfs.xfs" -m crc=1 -b size=$BLKSIZE -s size=$SECSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
*) *)
echo "Add appropriate mkfs command here" echo "Add appropriate mkfs command here"
exit 1 exit 99
;; ;;
esac esac
BASEFILE="1.img" BASEFILE="1.img"
@ -931,7 +932,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
for i in $(range 0 $((NDEVICES-1)) 1); do for i in $(range 0 $((NDEVICES-1)) 1); do
rm "$FSIMAGEP${i}.img" rm "$FSIMAGEP${i}.img"
done done
exit 1; exit 99;
fi fi
;; ;;
esac esac