tests: add --mountpoint to findmnt calls

... if necessary to make things more robust.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 2d85dbb5923caf9d2eec5b669d7b478b5d272710..1bd42dc5f83d8e7bb4de82b08509e3a338046a80 100755 (executable)
--- 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 e9b1cdf9a4c882782e8c4ce46d78587925cae3cd..f8a21e0107bb350aded0ece61cb923d6887267c1 100755 (executable)
--- 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 893d902e6b947282f548aec4f96ce349f6dfb6fd..1589af1eda7f98f47a499e250a9dcecf263ff57d 100755 (executable)
--- 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