summaryrefslogtreecommitdiffstats
path: root/tests/ts/libmount/context-utab-py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ts/libmount/context-utab-py')
-rwxr-xr-xtests/ts/libmount/context-utab-py11
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