Re: [PATCH 0/5] Various test fixes and improvements

[Glenn Washburn]

Please ignore this patch series.

Glenn

On Sun,  6 Feb 2022 02:02:39 -0600
Glenn Washburn <development@efficientek.com> wrote:

> Updated with Daniel's suggestions.
> 
> 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 | 56 ++++++++++++++++++++++++++++++------
>  2 files changed, 51 insertions(+), 9 deletions(-)
> 
> Range-diff:
> 1:  24b2a4bfd = 1:  313168dd7 tests: Do not remove image file on error in 
> pata_test
> 2:  a64ebe41a = 2:  53df676e7 tests: Skip pata_test on i386-efi
> 3:  d2248490b = 3:  401b227cb tests: Remove $((BASE#NUM)) bashism in 
> grub-fs-tester
> 4:  410461b20 ! 4:  264f914b1 tests: Ensure that mountpoints are unmounted 
> before exiting
>     @@ tests/util/grub-fs-tester.in: tempdir=`mktemp -d 
> "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
>       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;")"
>     ++cleanup() {
>     ++    for i in $MOUNTS; do
>     ++        umount "$i" || :
>      +    done
>      +}
>      +trap umount_all EXIT INT
> 5:  61bd6959b ! 5:  eb4a20b84 tests: Ensure that loopback devices and zfs 
> devices are cleaned up
>     @@ tests/util/grub-fs-tester.in: tempdir=`mktemp -d 
> "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
>       XORRISOFS_CHARSET="-input-charset UTF-8 -output-charset UTF-8"
>       
>       MOUNTS=
>     --umount_all() {
>      +LODEVICES=
>     -+cleanup() {
>     + cleanup() {
>      +    if [ -n "$fs" -a -z "${fs##*zfs*}" -a -n "$FSLABEL" ]; then
>      +        zpool list "$FSLABEL" 2>/dev/null &&
>      +        while ! zpool export "$FSLABEL" ; do
>     @@ tests/util/grub-fs-tester.in: tempdir=`mktemp -d 
> "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
>      +        done
>      +    fi
>      +
>     -     for MOUNT in $MOUNTS; do
>     -         umount "$MOUNT" &&
>     -         MOUNTS="$(echo ${MOUNTS} | sed "s|$MOUNT||g;")"
>     +     for i in $MOUNTS; do
>     +         umount "$i" || :
>           done
>      +
>      +    for lodev in $LODEVICES; do