[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 6/9] tests: Make setup errors in grub-fs-tester hard errors
From: |
Glenn Washburn |
Subject: |
[PATCH v4 6/9] tests: Make setup errors in grub-fs-tester hard errors |
Date: |
Tue, 12 Oct 2021 19:40:00 -0500 |
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>
---
tests/util/grub-fs-tester.in | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index cba94233d..9a05a2d26 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -6,7 +6,8 @@ fs="$1"
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
# 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
if test "$CFILESRC" = "" ; then
echo "Couldn't find compressible file" >&2
- exit 1
+ exit 99
fi
case x"$fs" in
# FS LIMITATION: 8.3 names
@@ -621,7 +622,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE"
1); do
mkdir -p "$MNTPOINTRO"
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
- LODEVICE=$(losetup --find --show "$FSIMAGEP${i}.img")
+ LODEVICE=$(losetup --find --show "$FSIMAGEP${i}.img")
|| exit 99
LODEVICES="$LODEVICES $LODEVICE"
if test "$i" = 0; then
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}" ;;
*)
echo "Add appropriate mkfs command here"
- exit 1
+ exit 99
;;
esac
BASEFILE="1.img"
@@ -931,7 +932,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE"
1); do
for i in $(range 0 $((NDEVICES-1)) 1); do
rm "$FSIMAGEP${i}.img"
done
- exit 1;
+ exit 99;
fi
;;
esac
--
2.27.0
- [PATCH v4 0/9] Various fixes/improvements for tests, Glenn Washburn, 2021/10/12
- [PATCH v4 7/9] tests: A failure of mktemp should cause the test script to exit with code 99, Glenn Washburn, 2021/10/12
- [PATCH v4 8/9] tests: Exit with skipped exit code when test not performed, Glenn Washburn, 2021/10/12
- [PATCH v4 3/9] tests: Add set -e to missing tests, Glenn Washburn, 2021/10/12
- [PATCH v4 5/9] tests: Do not occlude grub-shell return code, Glenn Washburn, 2021/10/12
- [PATCH v4 1/9] tests: Fix partmap_test for arm*-efi, disk numbering has changed, Glenn Washburn, 2021/10/12
- [PATCH v4 2/9] tests: When checking squashfs fstime, use superblock last modified time, Glenn Washburn, 2021/10/12
- [PATCH v4 4/9] tests: Do not occlude subshell error codes when used as input to the test command, Glenn Washburn, 2021/10/12
- [PATCH v4 6/9] tests: Make setup errors in grub-fs-tester hard errors,
Glenn Washburn <=
- [PATCH v4 9/9] tests: Use @BUILD_SHEBANG@ autoconf var instead of literal shell, Glenn Washburn, 2021/10/12