diff options
author | Karel Zak | 2016-03-08 13:38:36 +0100 |
---|---|---|
committer | Karel Zak | 2016-03-08 13:38:36 +0100 |
commit | 076153f8168d3dd7be073e24b4baf4c6d0a78c00 (patch) | |
tree | be298a3275700911e1f8c4f3c93f741bcffa3fcd /tests/ts/libmount/context-utab-py | |
parent | getopt: fix -n name for BSD (diff) | |
download | kernel-qcow2-util-linux-076153f8168d3dd7be073e24b4baf4c6d0a78c00.tar.gz kernel-qcow2-util-linux-076153f8168d3dd7be073e24b4baf4c6d0a78c00.tar.xz kernel-qcow2-util-linux-076153f8168d3dd7be073e24b4baf4c6d0a78c00.zip |
tests: don't compare btrfs mount options
We don't control mount options in the mountinfo file and the options
depend on kernel version. It does not make sense to hardcode the
options in the expected outputs.
Note that libmount should be portable enough to be able to work with
all kernel versions. It seems better to check libmount functionality
than kernel mount options formatting.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/libmount/context-utab-py')
-rwxr-xr-x | tests/ts/libmount/context-utab-py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py index fdde63a7a..b781fafd3 100755 --- a/tests/ts/libmount/context-utab-py +++ b/tests/ts/libmount/context-utab-py @@ -113,9 +113,14 @@ 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 "---" + +# Don't temporary write btrfs mount options to the test output, +# the options depend on kernel version (since 4.2 it contains +# subvol= and subvolid=). +# +#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" $PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 |