diff options
author | Stanislav Brabec | 2016-02-11 20:40:29 +0100 |
---|---|---|
committer | Karel Zak | 2016-02-12 10:39:14 +0100 |
commit | b59c3bf292269be1a203f91563b961e0062e0a5f (patch) | |
tree | 10eea7c12ca0408aae5af5b799ded7d187fec8e0 /tests/ts/mount | |
parent | tests: add btrfs mount tests (diff) | |
download | kernel-qcow2-util-linux-b59c3bf292269be1a203f91563b961e0062e0a5f.tar.gz kernel-qcow2-util-linux-b59c3bf292269be1a203f91563b961e0062e0a5f.tar.xz kernel-qcow2-util-linux-b59c3bf292269be1a203f91563b961e0062e0a5f.zip |
tests: fix redirection
Many tests do.
2>&1 >> $TS_OUTPUT
It redirects stdout to $TS_OUTPUT and stderr to stdout.
It could cause unintended ignoring of errors on strerr and false positive result
of the test.
Use
>> $TS_OUTPUT 2>&1
instead to redirect both stdout and stderr to $TS_OUTPUT.
Automatically created by:
cd tests/ts
sed -i 's:2>\&1 >> \$TS_OUTPUT:>> $TS_OUTPUT 2>\&1:g' $(fgrep -rl '2>&1 >> $TS_OUTPUT' .)
Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
Diffstat (limited to 'tests/ts/mount')
-rwxr-xr-x | tests/ts/mount/devname | 2 | ||||
-rwxr-xr-x | tests/ts/mount/fslists | 8 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-btrfs | 28 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-devname | 4 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-devname2label | 2 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-devname2uuid | 2 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-label | 6 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-label2devname | 4 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-label2uuid | 4 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-none | 2 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-symlink | 6 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-uuid | 6 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-uuid2devname | 4 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-uuid2label | 4 | ||||
-rwxr-xr-x | tests/ts/mount/label | 4 | ||||
-rwxr-xr-x | tests/ts/mount/regfile | 2 | ||||
-rwxr-xr-x | tests/ts/mount/uuid | 4 |
17 files changed, 46 insertions, 46 deletions
diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname index 2570fe3f5..caa79f7bb 100755 --- a/tests/ts/mount/devname +++ b/tests/ts/mount/devname @@ -38,7 +38,7 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists index 63f1fab12..64859ba38 100755 --- a/tests/ts/mount/fslists +++ b/tests/ts/mount/fslists @@ -42,7 +42,7 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_init_subtest "one-type" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -t ext3 $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -t ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT ts_log "Success" @@ -51,7 +51,7 @@ ts_finalize_subtest ts_init_subtest "more-types" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -t foo,bar,ext3 $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -t foo,bar,ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT ts_log "Success" @@ -61,7 +61,7 @@ ts_finalize_subtest ts_init_subtest "more-types-fstab" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext3" -$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_fstab_clean ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT @@ -71,7 +71,7 @@ ts_finalize_subtest ts_init_subtest "type-pattern" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -t nofoo,bar $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -t nofoo,bar $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT ts_log "Success" diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs index 0b11fd603..d14ad104d 100755 --- a/tests/ts/mount/fstab-btrfs +++ b/tests/ts/mount/fstab-btrfs @@ -82,16 +82,16 @@ ts_fstab_add "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "btrfs" "subvolid=$NON_DEFAULT_ # test bind mount pointing to subvolume root ts_fstab_add "$TS_MOUNTPOINT_SUBVOLID" "$TS_MOUNTPOINT_BIND" "auto" "bind" -$TS_CMD_MOUNT -a 2>&1 >> $TS_OUTPUT -$TS_CMD_MOUNT -a 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" 2>&1 >> $TS_OUTPUT -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" 2>&1 >> $TS_OUTPUT -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" 2>&1 >> $TS_OUTPUT -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" 2>&1 >> $TS_OUTPUT +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>&1 # check that everything was unmounted -$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>&1 ts_fstab_clean ts_log "Success" @@ -108,16 +108,16 @@ ts_fstab_add "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "auto" "subvolid=$NON_DEFAULT_S # test bind mount pointing to subvolume sub-directory ts_fstab_add "$TS_MOUNTPOINT_SUBVOL/bind-mnt" "$TS_MOUNTPOINT_BIND" "auto" "bind" -$TS_CMD_MOUNT -a 2>&1 >> $TS_OUTPUT -$TS_CMD_MOUNT -a 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" 2>&1 >> $TS_OUTPUT -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" 2>&1 >> $TS_OUTPUT -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" 2>&1 >> $TS_OUTPUT -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" 2>&1 >> $TS_OUTPUT +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>&1 # check that everything was unmounted -$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>&1 ts_fstab_clean ts_log "Success" diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname index f04e27040..8e391c806 100755 --- a/tests/ts/mount/fstab-devname +++ b/tests/ts/mount/fstab-devname @@ -40,12 +40,12 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_fstab_add $DEVICE # variant A) -$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label index e135a2bee..380b91d03 100755 --- a/tests/ts/mount/fstab-devname2label +++ b/tests/ts/mount/fstab-devname2label @@ -41,7 +41,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \ ts_fstab_add "LABEL=$LABEL" -$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid index 8fca1b90e..3ed19d2df 100755 --- a/tests/ts/mount/fstab-devname2uuid +++ b/tests/ts/mount/fstab-devname2uuid @@ -41,7 +41,7 @@ UUID=$(ts_uuid_by_devname $DEVICE) ts_fstab_add "UUID=$UUID" -$TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label index 8eec212cf..bc5a15f4f 100755 --- a/tests/ts/mount/fstab-label +++ b/tests/ts/mount/fstab-label @@ -42,17 +42,17 @@ ts_device_has "LABEL" $LABEL $DEVICE \ ts_fstab_add "LABEL=$LABEL" # variant A) -$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" # variant C) -$TS_CMD_MOUNT LABEL=$LABEL 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT LABEL=$LABEL >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname index 7ad2349d9..3dcaad54a 100755 --- a/tests/ts/mount/fstab-label2devname +++ b/tests/ts/mount/fstab-label2devname @@ -42,12 +42,12 @@ ts_device_has "LABEL" $LABEL $DEVICE \ ts_fstab_add "$DEVICE" # variant A) -$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid index 2a759f0c1..486d07041 100755 --- a/tests/ts/mount/fstab-label2uuid +++ b/tests/ts/mount/fstab-label2uuid @@ -47,12 +47,12 @@ UUID=$(ts_uuid_by_devname $DEVICE) ts_fstab_add "UUID=$UUID" # variant A) -$TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none index b90008f00..ff610a607 100755 --- a/tests/ts/mount/fstab-none +++ b/tests/ts/mount/fstab-none @@ -16,7 +16,7 @@ ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime" mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT" $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink index ba8dafb5b..1a12b8580 100755 --- a/tests/ts/mount/fstab-symlink +++ b/tests/ts/mount/fstab-symlink @@ -46,7 +46,7 @@ ln -s $DEVICE $LINKNAME ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user" # variant A) -- UID=0 -$TS_CMD_MOUNT $LINKNAME 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $LINKNAME >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" @@ -57,10 +57,10 @@ $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" #ts_init_suid $TS_CMD_MOUNT #ts_init_suid $TS_CMD_UMOUNT # -#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" 2>&1 >> $TS_OUTPUT +#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" >> $TS_OUTPUT 2>&1 #ts_is_mounted $DEVICE # || ts_die "B) Cannot find $DEVICE in /proc/mounts" -#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" 2>&1 >> $TS_OUTPUT \ +#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" >> $TS_OUTPUT 2>&1 \ # || ts_die "B) Cannot umount $LINKNAME" ts_fstab_clean diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid index 867bc081d..afe414dc4 100755 --- a/tests/ts/mount/fstab-uuid +++ b/tests/ts/mount/fstab-uuid @@ -42,17 +42,17 @@ UUID=$(ts_uuid_by_devname $DEVICE) ts_fstab_add "UUID=$UUID" # varian A) -$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # varian B) -$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" # varian C) -$TS_CMD_MOUNT UUID=$UUID 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT UUID=$UUID >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname index 0196843e3..3197148bd 100755 --- a/tests/ts/mount/fstab-uuid2devname +++ b/tests/ts/mount/fstab-uuid2devname @@ -42,12 +42,12 @@ UUID=$(ts_uuid_by_devname $DEVICE) ts_fstab_add "$DEVICE" # variant A) -$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label index 641838979..22c5647dd 100755 --- a/tests/ts/mount/fstab-uuid2label +++ b/tests/ts/mount/fstab-uuid2label @@ -46,12 +46,12 @@ UUID=$(ts_uuid_by_devname $DEVICE) ts_fstab_add "LABEL=$LABEL" # variant A) -$TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/label b/tests/ts/mount/label index 451a9eb67..09f598e12 100755 --- a/tests/ts/mount/label +++ b/tests/ts/mount/label @@ -41,12 +41,12 @@ ts_device_has "LABEL" $LABEL $DEVICE \ [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT # variant A) -$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile index 989806248..4f5ce303a 100755 --- a/tests/ts/mount/regfile +++ b/tests/ts/mount/regfile @@ -21,7 +21,7 @@ mkfs.ext3 -F $IMAGE &> /dev/null || ts_die "Cannot make ext3 on $IMAGE" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 DEVICE=$(awk '/regfile/ { print $1 }' /proc/mounts) diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid index 442860ca4..efd2774ed 100755 --- a/tests/ts/mount/uuid +++ b/tests/ts/mount/uuid @@ -40,12 +40,12 @@ UUID=$(ts_uuid_by_devname $DEVICE) [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT # variant A) -$TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT +$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" |