ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: grammar fixes 

Trivial change, "Cannot found" to "Cannot find".

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
This commit is contained in:
Davidlohr Bueso 2011-08-17 11:51:19 -04:00 committed by Karel Zak
parent b71e4c30b6
commit d8c36bdf03
28 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ts/blkid/md-raid1-part
View File

@ -34,7 +34,7 @@ modprobe scsi_debug dev_size_mb=51 sector_size=512
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"

4
tests/ts/cramfs/mkfs
View File

@ -68,13 +68,13 @@ DEVICE=$($TS_CMD_LOSETUP -s -f $IMAGE_PATH)
ts_log "check the image"
ts_device_has "TYPE" "cramfs" $DEVICE
[ "$?" == "0" ] || ts_die "Cannot found cramfs on $DEVICE" $DEVICE
[ "$?" == "0" ] || ts_die "Cannot find cramfs on $DEVICE" $DEVICE
ts_log "mount the image"
$TS_CMD_MOUNT -r -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
# check it
ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
cd $TS_MOUNTPOINT

2
tests/ts/fdisk/align-512-4K
View File

@ -37,7 +37,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512 physblk_exp=3
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"

2
tests/ts/fdisk/align-512-4K-63
View File

@ -37,7 +37,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"

2
tests/ts/fdisk/align-512-4K-md
View File

@ -38,7 +38,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512 physblk_exp=3
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"

2
tests/ts/fdisk/align-512-512-topology
View File

@ -37,7 +37,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"

2
tests/ts/fsck/ismounted
View File

@ -30,7 +30,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot found ext3 on $DEVICE" $DEVICE
ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT

4
tests/ts/libmount/tabfiles-tags
View File

@ -24,7 +24,7 @@ modprobe scsi_debug dev_size_mb=50 sector_size=512
sleep 3
DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot found device"
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
DEVICE="/dev/${DEVNAME}"
LABEL="testLibmount"
@ -34,7 +34,7 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
# Create filesystem
#
mkfs.ext3 -F -L $LABEL $DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
FSTAB="$TS_OUTDIR/fstab"

2
tests/ts/minix/mkfs
View File

@ -36,7 +36,7 @@ ts_log "mount the filesystem"
$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
# check it
ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
ts_log "umount the image"
$TS_CMD_UMOUNT $DEVICE

4
tests/ts/mount/fstab-broken
View File

@ -37,7 +37,7 @@ ts_init_subtest "mount"
$TS_CMD_MOUNT $MNT &> /dev/null
$TS_CMD_FINDMNT --kernel --target "$MNT" &> /dev/null
if [ "$?" != "0" ]; then
ts_log "Cannot found $MNT in /proc/self/mountinfo"
ts_log "Cannot find $MNT in /proc/self/mountinfo"
else
ts_log "OK"
fi
@ -49,7 +49,7 @@ ts_init_subtest "mount-all"
$TS_CMD_MOUNT -a &> /dev/null
$TS_CMD_FINDMNT --kernel --target "$MNT" &> /dev/null
if [ "$?" != "0" ]; then
ts_log "Cannot found $MNT in /proc/self/mountinfo"
ts_log "Cannot find $MNT in /proc/self/mountinfo"
else
ts_log "OK"
fi

6
tests/ts/mount/fstab-devname
View File

@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot found ext3 on $DEVICE" $DEVICE
ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@ -37,12 +37,12 @@ ts_fstab_add $DEVICE
# variant A)
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

4
tests/ts/mount/fstab-devname2label
View File

@ -31,14 +31,14 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
|| ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
ts_fstab_add "LABEL=$LABEL"
$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

4
tests/ts/mount/fstab-devname2uuid
View File

@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@ -38,7 +38,7 @@ UUID=$(ts_uuid_by_devname $DEVICE)
ts_fstab_add "UUID=$UUID"
$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

8
tests/ts/mount/fstab-label
View File

@ -31,7 +31,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
|| ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@ -39,17 +39,17 @@ ts_fstab_add "LABEL=$LABEL"
# variant A)
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
# variant C)
$TS_CMD_MOUNT LABEL=$LABEL 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

6
tests/ts/mount/fstab-label2devname
View File

@ -31,7 +31,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
|| ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@ -39,12 +39,12 @@ ts_fstab_add "$DEVICE"
# variant A)
$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

8
tests/ts/mount/fstab-label2uuid
View File

@ -32,9 +32,9 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
|| ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@ -44,12 +44,12 @@ ts_fstab_add "UUID=$UUID"
# variant A)
$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

6
tests/ts/mount/fstab-symlink
View File

@ -32,7 +32,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot found ext3 on $DEVICE" $DEVICE
ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
@ -43,7 +43,7 @@ ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user"
# variant A) -- UID=0
$TS_CMD_MOUNT $LINKNAME 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" $DEVICE
# varian B) -- disabled, the $TS_CMD_MOUNT is usually not a real program, but
@ -55,7 +55,7 @@ $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" $DEVICE
#
#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" 2>&1 >> $TS_OUTPUT
#ts_is_mounted $DEVICE
# || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
# || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" 2>&1 >> $TS_OUTPUT \
# || ts_die "B) Cannot umount $LINKNAME" $DEVICE

8
tests/ts/mount/fstab-uuid
View File

@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@ -39,17 +39,17 @@ ts_fstab_add "UUID=$UUID"
# varian A)
$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# varian B)
$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
# varian C)
$TS_CMD_MOUNT UUID=$UUID 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "C) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

6
tests/ts/mount/fstab-uuid2devname
View File

@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@ -39,12 +39,12 @@ ts_fstab_add "$DEVICE"
# variant A)
$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

8
tests/ts/mount/fstab-uuid2label
View File

@ -31,9 +31,9 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
|| ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@ -43,12 +43,12 @@ ts_fstab_add "LABEL=$LABEL"
# variant A)
$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

6
tests/ts/mount/label
View File

@ -32,18 +32,18 @@ DEVICE=$(ts_device_init)
mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
|| ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
# variant A)
$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

4
tests/ts/mount/move
View File

@ -35,14 +35,14 @@ $TS_CMD_MOUNT --bind $DIR_SRC $DIR_A
# check the bind
$TS_CMD_FINDMNT --kernel --target "$DIR_A" &> /dev/null
[ "$?" == "0" ] || ts_die "Cannot found binded $DIR_A in /proc/self/mountinfo"
[ "$?" == "0" ] || ts_die "Cannot find binded $DIR_A in /proc/self/mountinfo"
# move
$TS_CMD_MOUNT --move $DIR_A $DIR_B
# check the move
$TS_CMD_FINDMNT --kernel --target "$DIR_B" &> /dev/null
[ "$?" == "0" ] || ts_die "Cannot found binded $DIR_B in /proc/self/mountinfo"
[ "$?" == "0" ] || ts_die "Cannot find binded $DIR_B in /proc/self/mountinfo"
# clean up
$TS_CMD_UMOUNT $DIR_B

2
tests/ts/mount/regfile
View File

@ -21,7 +21,7 @@ $TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
DEVICE=$(awk '/regfile/ { print $1 }' /proc/mounts)
grep -q "$TS_MOUNTPOINT" /proc/mounts || ts_die "Cannot found $TS_MOUNTPOINT in /proc/mounts"
grep -q "$TS_MOUNTPOINT" /proc/mounts || ts_die "Cannot find $TS_MOUNTPOINT in /proc/mounts"
if [ -f "/sys/block/$(basename $DEVICE)/loop" ]; then
$TS_CMD_UMOUNT $IMAGE || ts_die "Cannot umount $IMAGE"

4
tests/ts/mount/remount
View File

@ -35,7 +35,7 @@ $TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT || ts_die "Cannot mount $TS_MOUNTPOINT" $DE
# check the mount
egrep -q "^$DEVICE $TS_MOUNTPOINT" /etc/mtab \
|| ts_die "Cannot found $TS_MOUNTPOINT in /etc/mtab" $DEVICE
|| ts_die "Cannot find $TS_MOUNTPOINT in /etc/mtab" $DEVICE
# remount
$TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
@ -43,7 +43,7 @@ $TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
# check the remount
$TS_CMD_FINDMNT --kernel --target "$TS_MOUNTPOINT" --options "ro" &> /dev/null
[ "$?" == "0" ] || ts_die "Cannot found read-only in $TS_MOUNTPOINT in /proc/self/mountinfo"
[ "$?" == "0" ] || ts_die "Cannot find read-only in $TS_MOUNTPOINT in /proc/self/mountinfo"
ts_device_deinit $DEVICE

6
tests/ts/mount/uuid
View File

@ -29,7 +29,7 @@ DEVICE=$(ts_device_init)
mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
@ -37,12 +37,12 @@ UUID=$(ts_uuid_by_devname $DEVICE)
# variant A)
$TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "A) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
# variant B)
$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
ts_is_mounted $DEVICE || ts_die "B) Cannot found $DEVICE in /proc/mounts" $DEVICE
ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
ts_device_deinit $DEVICE

4
tests/ts/swapon/devname
View File

@ -30,12 +30,12 @@ DEVICE=$(ts_device_init)
$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
|| ts_die "Cannot make swap $DEVICE" $DEVICE
ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot found swap on $DEVICE" $DEVICE
ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON $DEVICE 2>&1 >> $TS_OUTPUT
grep -q $DEVICE /proc/swaps || ts_die "Cannot found $DEVICE in /proc/swaps" $DEVICE
grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
ts_swapoff $DEVICE
ts_device_deinit $DEVICE

4
tests/ts/swapon/label
View File

@ -32,12 +32,12 @@ $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \
|| ts_die "Cannot make swap on $DEVICE" $DEVICE
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
|| ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON -L $LABEL 2>&1 >> $TS_OUTPUT
grep -q $DEVICE /proc/swaps || ts_die "Cannot found $DEVICE in /proc/swaps" $DEVICE
grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
ts_swapoff $DEVICE
ts_device_deinit $DEVICE

4
tests/ts/swapon/uuid
View File

@ -30,14 +30,14 @@ DEVICE=$(ts_device_init)
$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
|| ts_die "Cannot make swap $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON -U $UUID 2>&1 >> $TS_OUTPUT
grep -q $DEVICE /proc/swaps || ts_die "Cannot found $DEVICE in /proc/swaps" $DEVICE
grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
ts_swapoff $DEVICE
ts_device_deinit $DEVICE