diff options
Diffstat (limited to 'tests/ts/libmount/context-utab')
-rwxr-xr-x | tests/ts/libmount/context-utab | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab index 8b93fe990..38bc1701c 100755 --- a/tests/ts/libmount/context-utab +++ b/tests/ts/libmount/context-utab @@ -15,6 +15,7 @@ ts_check_test_command "$TS_CMD_UUIDGEN" ts_skip_nonroot ts_check_prog "mkfs.ext4" +ts_check_prog "mkfs.btrfs" TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT" LABEL=libmount-test @@ -93,35 +94,33 @@ grep -q $DEVICE $LIBMOUNT_UTAB && \ ts_finalize_subtest -if [ -x "/sbin/mkfs.btrfs" ]; then - $TS_CMD_WIPEFS -a $DEVICE &> /dev/null - ts_log "Create filesystem [btrfs]" - mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null - udevadm settle +$TS_CMD_WIPEFS -a $DEVICE &> /dev/null +ts_log "Create filesystem [btrfs]" +mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null +udevadm settle - mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null - btrfs subvolume create $MOUNTPOINT/sub &> /dev/null - umount $MOUNTPOINT &> /dev/null +mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null +btrfs subvolume create $MOUNTPOINT/sub &> /dev/null +umount $MOUNTPOINT &> /dev/null - udevadm settle +udevadm settle - ts_init_subtest "mount-uhelper-subvol" - mkdir -p $MOUNTPOINT &> /dev/null - ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 - grep -q $DEVICE $LIBMOUNT_UTAB || \ - echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 - ts_finalize_subtest +ts_init_subtest "mount-uhelper-subvol" +mkdir -p $MOUNTPOINT &> /dev/null +ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 +grep -q $DEVICE $LIBMOUNT_UTAB || \ + echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 +ts_finalize_subtest - ts_log "All mount options (btrfs subvolume + utab) ---" - $TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 - ts_log "---" +ts_log "All mount options (btrfs subvolume + utab) ---" +$TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 +ts_log "---" - ts_init_subtest "umount-subvol" - ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 - grep -q $DEVICE $LIBMOUNT_UTAB && \ - echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 - ts_finalize_subtest -fi +ts_init_subtest "umount-subvol" +ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +grep -q $DEVICE $LIBMOUNT_UTAB && \ + echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 +ts_finalize_subtest ts_log "...done." rmmod scsi_debug |