shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-27 10:25:13 +03:00
Code Releases Activity

tests: fix cleanup for unbound variables

Browse Source 
When loop can't handle sector-size option - failure caused double fail
for access of unbound variable
Also fix expression for 'rm' and remove loops after loop release.
This commit is contained in:
Zdenek Kabelac 2020-09-20 00:32:26 +02:00
parent f507a2564c
commit bc9bb534ff
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/shell/integrity-blocksize.sh
View File

@ -23,12 +23,13 @@ cleanup_mounted_and_teardown()
{
umount "$mnt" || true
vgremove -ff $vg1 $vg2 || true
losetup -d $LOOP1 || true
losetup -d $LOOP2 || true
losetup -d $LOOP3 || true
losetup -d $LOOP4 || true
rm -f loop{abcd}
test -n "${LOOP1-}" && { losetup -d "$LOOP1" || true ; }
test -n "${LOOP2-}" && { losetup -d "$LOOP2" || true ; }
test -n "${LOOP3-}" && { losetup -d "$LOOP3" || true ; }
test -n "${LOOP4-}" && { losetup -d "$LOOP4" || true ; }
rm -f loop[abcd]
aux teardown
}
@ -57,10 +58,10 @@ dd if=/dev/zero of=loopb bs=1M count=64 oflag=sync
dd if=/dev/zero of=loopc bs=1M count=64 oflag=sync
dd if=/dev/zero of=loopd bs=1M count=64 oflag=sync
LOOP1=$(losetup -f loopa --show)
LOOP2=$(losetup -f loopb --show)
LOOP3=$(losetup -f loopc --sector-size 4096 --show)
LOOP4=$(losetup -f loopd --sector-size 4096 --show)
LOOP1=$(losetup -f loopa --show) || skip "Cannot find free loop device"
LOOP2=$(losetup -f loopb --show) || skip "Cannot find free loop device"
LOOP3=$(losetup -f loopc --sector-size 4096 --show) || skip "Loop cannot handle --sector-size 4096"
LOOP4=$(losetup -f loopd --sector-size 4096 --show) || skip "Loop cannot handle --sector-size 4096"
echo $LOOP1
echo $LOOP2