summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2016-03-10 12:49:49 +0100
committerKarel Zak2016-03-10 12:49:49 +0100
commite6bc81500fbfed0291282c8da0677e60eff4fcd0 (patch)
tree0099ef0164916d5b6c4c52cc3925f25e1bb92ba2
parentsfdisk, fdisk: add fflush() (diff)
parenttests: skip btrfs tests if version too old (diff)
downloadkernel-qcow2-util-linux-e6bc81500fbfed0291282c8da0677e60eff4fcd0.tar.gz
kernel-qcow2-util-linux-e6bc81500fbfed0291282c8da0677e60eff4fcd0.tar.xz
kernel-qcow2-util-linux-e6bc81500fbfed0291282c8da0677e60eff4fcd0.zip
Merge branch 'test-btrfs' of https://github.com/rudimeier/util-linux
-rwxr-xr-xtests/ts/mount/fstab-btrfs4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs
index ed243c30f..30aed1d32 100755
--- a/tests/ts/mount/fstab-btrfs
+++ b/tests/ts/mount/fstab-btrfs
@@ -29,6 +29,10 @@ ts_check_losetup
ts_check_prog "mkfs.btrfs"
ts_check_prog "btrfs"
+# btrfs feature check
+btrfs inspect rootid bla 2>&1 | grep -q "unknown token" \
+ && ts_skip "btrfs too old"
+
TS_MOUNTPOINT_ANY="$TS_MOUNTPOINT"
TS_MOUNTPOINT_CREATE="$TS_MOUNTPOINT-create"
TS_MOUNTPOINT_DEFAULT="$TS_MOUNTPOINT-default"