Various test fixes and improvements
cover Various test fixes and improvements
I believe the patches are fairly self explantatory.
Glenn
Glenn Washburn (5):
tests: Do not remove image file on error in pata_test
tests: Skip pata_test on i386-efi
tests: Remove $((BASE#NUM)) bashism in grub-fs-tester
tests: Ensure that mountpoints are unmounted before exiting
tests: Ensure that loopback devices and zfs devices are cleaned up
tests/pata_test.in | 4 ++- tests/util/grub-fs-tester.in | 57 +++++++++++++++++++++++++++++++----- 2 files changed, 52 insertions(+), 9 deletions(-)
Signature · 1 line
2.27.0
PATCH 1/5 tests: Do not remove image file on error in pata_test
The image file can be useful in debugging an issue when the test fails.
--- tests/pata_test.in | 1 - 1 file changed, 1 deletion(-)
tests/pata_test.in +0 -1
@@ -47,7 +47,6 @@ tar cf "$imgfile" "$outfile" v=$(echo "nativedisk; source '($indisk)/$outfile';" | "${grubshell}" --qemu-opts="-$disk $imgfile") if [ "$v" != "Hello World" ]; then - rm "$imgfile" rm "$outfile" exit 1 fi
Signature · 1 line
2.27.0
PATCH 2/5 tests: Skip pata_test on i386-efi
In reply to Glenn WashburnIn comparison to other i386 targets, on i386-efi the Q35 QEMU machine type is used to do the testing to be able to make use of the EFI firmware in QEMU. On the Q35 machine type there is no way to use ATA to communicate with an IDE, only AHCI.
--- tests/pata_test.in | 3 +++ 1 file changed, 3 insertions(+)
tests/pata_test.in +3 -0
@@ -29,6 +29,9 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in # PLATFORM: no ATA on ARC platforms (they use SCSI) *-arc) exit 77;; + # QEMU: no ATA on Q35 machine type (they use AHCI) + i386-efi) + exit 77;; # FIXME: No native drivers are available for those powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi) exit 77;;
Signature · 1 line
2.27.0
PATCH 3/5 tests: Remove $((BASE#NUM)) bashism in grub-fs-tester
In reply to Glenn WashburnThis bashism allows converting NUM in base BASE to decimal. Its not needed because the only place its used is to convert from hexidecimal and this can also be done with the more portable $((0xHEXNUM)) syntax.
--- tests/util/grub-fs-tester.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tests/util/grub-fs-tester.in +5 -5
@@ -459,7 +459,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do # FIXME: not so sure about AFFS # OS LIMITATION: minix2/minix3 could be formatted in a way to permit more. x"minix3" | x"minix2" | x"hfs"| x"affs" | xaffs_intl | xreiserfs_old | xext2_old) - BIGBLOCKCNT=$((16#7fffffff));; + BIGBLOCKCNT=$((0x7fffffff));; # FS LIMITATION: redundant storage # We have only limited space. Mirroring multiplies it very effectively.
@@ -669,18 +669,18 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do # mkfs.hfs and mkfs.hfsplus don't fill UUID. x"hfsplus") "mkfs.hfsplus" -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}" - dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#468)) conv=notrunc count=8 ;; + dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x468)) conv=notrunc count=8 ;; x"hfsplus_wrap") "mkfs.hfsplus" -w -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}" - dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#468)) conv=notrunc count=8 + dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x468)) conv=notrunc count=8 MOUNTFS="hfsplus";; x"hfsplus_casesens") "mkfs.hfsplus" -s -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}" - dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#468)) conv=notrunc count=8 + dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x468)) conv=notrunc count=8 MOUNTFS="hfsplus";; x"hfs") "mkfs.hfs" -b $BLKSIZE -v "`echo $FSLABEL |recode utf8..macroman`" -h "${MOUNTDEVICE}" - dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#474)) conv=notrunc count=8 + dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x474)) conv=notrunc count=8 MOUNTOPTS="iocharset=utf8,codepage=macroman," ;; x"vfat"*|xmsdos*)
Signature · 1 line
2.27.0
PATCH 5/5 tests: Ensure that loopback devices and zfs devices are cleaned up
In reply to Glenn WashburnZFS file systems are not unmounted using umount, but instead by exporting them. So export the ZFS file system that has the same label as the one that was created during the test, if such one exists. This is required to delete the loopback device that uses the ZFS image file. Otherwise the added code to delete all loopback devices setup during the test run will never be able to finish because the loopback device can not be deleted while in use.
--- tests/util/grub-fs-tester.in | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
tests/util/grub-fs-tester.in +20 -3
@@ -14,15 +14,32 @@ tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || XORRISOFS_CHARSET="-input-charset UTF-8 -output-charset UTF-8" MOUNTS= -umount_all() { +LODEVICES= +cleanup() { + if [ -n "$fs" -a -z "${fs##*zfs*}" -a -n "$FSLABEL" ]; then + zpool list "$FSLABEL" 2>/dev/null && + while ! zpool export "$FSLABEL" ; do + sleep 1; + done + fi + for MOUNT in $MOUNTS; do umount "$MOUNT" && MOUNTS="$(echo ${MOUNTS} | sed "s|$MOUNT||g;")" done + + for lodev in $LODEVICES; do + local i=600 + while losetup -l -O NAME | grep -q "^$lodev\$"; do + losetup -d "$lodev" || sleep 1 + [ "$((i--))" = "0" ] && break + done + done + return 0 } -trap umount_all EXIT INT +trap cleanup EXIT INT # This is for bash, dash and ash do not recognize ERR -trap umount_all ERR || : +trap cleanup ERR || : # This wrapper is to ease insertion of valgrind or time statistics run_it () {
Signature · 1 line
2.27.0
PATCH 4/5 tests: Ensure that mountpoints are unmounted before exiting
In reply to Glenn WashburnWhen all tests complete successfully, filesystems mounted by grub-fs-tester will be unmounted before exiting. However, on certain test failures the tester will exit with a failure code and not unmount previously mounted filesystems. Now keep track of mounts and umounts and run an exit handler on exit or process interruption that will umount all mounts that haven't already been unmounted.
--- tests/util/grub-fs-tester.in | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
tests/util/grub-fs-tester.in +27 -3
@@ -13,6 +13,17 @@ tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || # FSLABEL. This is especially needed for the conversion to Joliet UCS-2. XORRISOFS_CHARSET="-input-charset UTF-8 -output-charset UTF-8" +MOUNTS= +umount_all() { + for MOUNT in $MOUNTS; do + umount "$MOUNT" && + MOUNTS="$(echo ${MOUNTS} | sed "s|$MOUNT||g;")" + done +} +trap umount_all EXIT INT +# This is for bash, dash and ash do not recognize ERR +trap umount_all ERR || : + # This wrapper is to ease insertion of valgrind or time statistics run_it () { LC_ALL=C "$GRUBFSTEST" "$@"
@@ -934,6 +945,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do done exit 99; fi + MOUNTS="$MOUNTS $MNTPOINTRW" ;; esac case x"$fs" in
@@ -1058,11 +1070,13 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do x"bfs") sleep 1 fusermount -u "$MNTPOINTRW" + MOUNTS="$(echo ${MOUNTS} | sed "s|$MNTPOINTRW||g;")" ;; xlvm*) sleep 1 for try in $(range 0 20 1); do if umount "$MNTPOINTRW" ; then + MOUNTS="$(echo ${MOUNTS} | sed "s|$MNTPOINTRW||g;")" break; fi sleep 1;
@@ -1075,6 +1089,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do sleep 1 for try in $(range 0 20 1); do if umount "$MNTPOINTRW" ; then + MOUNTS="$(echo ${MOUNTS} | sed "s|$MNTPOINTRW||g;")" break; fi sleep 1;
@@ -1087,6 +1102,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do sleep 1 for try in $(range 0 20 1); do if umount "$MNTPOINTRW" ; then + MOUNTS="$(echo ${MOUNTS} | sed "s|$MNTPOINTRW||g;")" break; fi sleep 1;
@@ -1116,13 +1132,19 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do xlvm*) vgchange -a y grub_test sleep 1 - mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro ;; + mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro + MOUNTS="$MOUNTS $MNTPOINTRO" + ;; xmdraid*) mdadm --assemble /dev/md/"${fs}_$NDEVICES" $LODEVICES sleep 1 - mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro ;; + mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro + MOUNTS="$MOUNTS $MNTPOINTRO" + ;; *) - mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro ;; + mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro + MOUNTS="$MOUNTS $MNTPOINTRO" + ;; esac run_grubfstest ls -- -la
@@ -1547,6 +1569,8 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do sleep 1 umount "$MNTPOINTRO" || true umount "$MNTPOINTRW" || true + MOUNTS="$(echo ${MOUNTS} | sed "s|$MNTPOINTRO||g;")" + MOUNTS="$(echo ${MOUNTS} | sed "s|$MNTPOINTRW||g;")" esac sleep 1 case x"$fs" in
Signature · 1 line
2.27.0
Re: [PATCH 4/5] tests: Ensure that mountpoints are unmounted before exiting
Quoted 17 lines · Glenn Washburn
When all tests complete successfully, filesystems mounted by grub-fs-tester will be unmounted before exiting. However, on certain test failures the tester will exit with a failure code and not unmount previously mounted filesystems. Now keep track of mounts and umounts and run an exit handler on exit or process interruption that will umount all mounts that haven't already been unmounted.
Signed-off-by Glenn Washburn <[email protected]>--- tests/util/grub-fs-tester.in | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)tests/util/grub-fs-tester.in +0
-0
tests/util/grub-fs-tester.in tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || · line 17
Quoted 5 lines
tests/util/grub-fs-tester.in +2
-0@@ -13,6 +13,17 @@ tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || # FSLABEL. This is especially needed for the conversion to Joliet UCS-2. XORRISOFS_CHARSET="-input-charset UTF-8 -output-charset UTF-8" +MOUNTS= +umount_all() {
I would do s/umount_all/cleanup/ here and avoid rename in the next patch.
tests/util/grub-fs-tester.in tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || · line 18
Quoted 1 line
tests/util/grub-fs-tester.in +1
-0+ for MOUNT in $MOUNTS; do
for i in $MOUNTS; do
It is a bit difficult to differentiate MOUNT and MOUNTS.
tests/util/grub-fs-tester.in tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || · line 20
Quoted 2 lines
tests/util/grub-fs-tester.in +2
-0+ umount "$MOUNT" && + MOUNTS="$(echo ${MOUNTS} | sed "s|$MOUNT||g;")"
I think this is unneeded. Is it?
tests/util/grub-fs-tester.in tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || · line 25
Quoted 5 lines
tests/util/grub-fs-tester.in +5
-0+ done +} +trap umount_all EXIT INT +# This is for bash, dash and ash do not recognize ERR +trap umount_all ERR || :
Daniel
Quoted 8 lines · Glenn Washburn
I believe the patches are fairly self explantatory.
Glenn
Glenn Washburn (5):
tests: Do not remove image file on error inpata_test
tests: Skippata_teston i386-efi
tests: Remove $((BASE#NUM)) bashism in grub-fs-tester
For first three patches Reviewed-by: Daniel Kiper <[email protected]>...
Daniel