tst_test.sh: Fix check for non-mounted device
PATCH 1/1 tst_test.sh: Fix check for non-mounted device
1) unset TST_DEVICE if acquiring failed
2) do not try to umount the device in this case
Maybe sometimes missing $device in tst_umount() is error, but mostly at least in case of df01.sh it's not, therefore return without warning.
This fixes error:
df01 1 TBROK: Failed to acquire device
grep: Unmatched [, [^, [:, [., or [=
grep: Unmatched [, [^, [:, [., or [=
df01 1 TINFO: The tst_device 0 TINFO : Found free device 0 '/dev/loop0'
Test device='/dev/loop0'tst_device 0 TINFO : Formatting /dev/loop0 with ext2 opts='' extra opts='' is not mounted, skipping umount
--- testcases/lib/tst_test.sh | 3 +++ 1 file changed, 3 insertions(+)
testcases/lib/tst_test.sh +3 -0
@@ -273,6 +273,8 @@ tst_umount() local device="${1:-$TST_DEVICE}" local i=0 + [ -z "$device" ] && return + if ! grep -q "$device" /proc/mounts; then tst_res TINFO "The $device is not mounted, skipping umount" return
@@ -546,6 +548,7 @@ tst_run() TST_DEVICE=$(tst_device acquire) if [ ! -b "$TST_DEVICE" -o $? -ne 0 ]; then + unset TST_DEVICE tst_brk TBROK "Failed to acquire device" fi
Signature · 1 line
2.24.0
PATCH 1/1 tst_test.sh: Fix check for non-mounted device
Hi!
Quoted 2 lines
1) unset
TST_DEVICEif acquiring failed
2) do not try to umount the device in this case
Looks good, acked.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 tst_test.sh: Fix check for non-mounted device
Hi Cyril,
Quoted 5 lines
Hi!
Quoted 2 lines
1) unset
TST_DEVICEif acquiring failed
2) do not try to umount the device in this caseLooks good, acked.
Thanks for your review, merged.
Kind regards,
Petr