btrfs-progs: tests: check if subvolume delete by id is supported

Skip the test 013-subvolume-delete-by-id if the first valid attempt to
use the ioctl fails with 'Inappropriate ioctl for device'.

Signed-off-by: David Sterba <dsterba@suse.com>
David Sterba 2020-03-21 00:34:16 +01:00
parent a3b12468c0
commit f541f59e9a
1 changed files with 10 additions and 2 deletions

View File

@ -27,10 +27,18 @@ run_mustfail "subvolume delete --subvolid expects only one extra argument, the m
$SUDO_HELPER "$TOP/btrfs" subvolume delete --subvolid 256 "$TEST_MNT" "$TEST_MNT"
# Delete the recently created subvol using the subvolid
run_check $SUDO_HELPER "$TOP/btrfs" subvolume delete --subvolid 256 "$TEST_MNT"
# (First run is conditional to check for kernel support)
out=$(run_mayfail_stdout $SUDO_HELPER "$TOP/btrfs" subvolume delete --subvolid 256 "$TEST_MNT")
ret="$?"
run_check_umount_test_dev
if [ "$ret" != 0 ]; then
if echo "$out" | grep -q 'Inappropriate ioctl for device'; then
_not_run "subvolume delete --subvolid not supported"
fi
_fail "$out"
fi
run_check_mount_test_dev -o subvol=subvol2
# When the subvolume subvol3 is mounted, subvol2 is not reachable by the
# current mount point, but "subvolume delete --subvolid" should be able to