diff options
| author | Karel Zak | 2017-03-31 14:00:24 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-03-31 14:00:24 +0200 |
| commit | eff2c9a42621b4cba81a81bc78f431b00e8a2968 (patch) | |
| tree | 6ff934876b0e1a2a8fc57974c495c1677c3bd695 | |
| parent | utmpdump: remove unnecessary variable (diff) | |
| download | kernel-qcow2-util-linux-eff2c9a42621b4cba81a81bc78f431b00e8a2968.tar.gz kernel-qcow2-util-linux-eff2c9a42621b4cba81a81bc78f431b00e8a2968.tar.xz kernel-qcow2-util-linux-eff2c9a42621b4cba81a81bc78f431b00e8a2968.zip | |
tests: add --mountpoint to findmnt calls
... if necessary to make things more robust.
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rwxr-xr-x | tests/ts/libmount/context | 4 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-utab | 4 | ||||
| -rwxr-xr-x | tests/ts/libmount/loop | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 2d85dbb59..1bd42dc5f 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -119,11 +119,11 @@ ts_finalize_subtest ts_init_subtest "mount-flags" mkdir -p $MOUNTPOINT &> /dev/null ts_valgrind $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 -$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 +$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 ts_valgrind $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>&1 -$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 +$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab index e9b1cdf9a..f8a21e010 100755 --- a/tests/ts/libmount/context-utab +++ b/tests/ts/libmount/context-utab @@ -9,7 +9,7 @@ TS_DESC="context (utab)" ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" -ts_check_test_command "$TS_CMD_FINDMNT" +#ts_check_test_command "$TS_CMD_FINDMNT" ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_check_test_command "$TS_CMD_WIPEFS" @@ -118,7 +118,7 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then # subvol= and subvolid=). # #ts_log "All mount options (btrfs subvolume + utab) ---" - #$TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 + #$TS_CMD_FINDMNT --mtab --mountpoint $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 #ts_log "---" ts_init_subtest "umount-subvol" diff --git a/tests/ts/libmount/loop b/tests/ts/libmount/loop index 893d902e6..1589af1ed 100755 --- a/tests/ts/libmount/loop +++ b/tests/ts/libmount/loop @@ -33,7 +33,7 @@ ts_check_prog "mkfs.ext3" function verify_mount_dev { local dev=$1 local mp=$2 - local dev_mounted=$($TS_CMD_FINDMNT -no SOURCE "$mp") + local dev_mounted=$($TS_CMD_FINDMNT -no SOURCE --mountpoint "$mp") if test "$dev" != "$dev_mounted" ; then echo "Mounted incorrect device: have '$dev_mounted', want '$dev'" >&2 |