tests: improve skipping of old btrfs-tools

Older Linux distributions came with differently incomplete
btrfs-tools 0.19+git versions (2009-2013). Old mkfs.btrfs
needs minimum device size 256M.

Note the most simple way to skip btrfs-tools < 3.14 would be
  btrfs property --help 2>&1 || ts_skip "btrfs too old"
but I want to include 3.12 because of Ubuntu Trusty on travis.

This patch partly reverts/rewrites the following commits:
7e604f3c - tests: don't skip case "output undefined"
076153f8 - tests: don't compare btrfs mount options
370d31f7 - tests: skip btrfs tests if version too old

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/expected/libmount/context-utab b/tests/expected/libmount/context-utab
index 10d4d566a862b9a7b00fd7067b4473f7af26504a..7b403e5551d3a7c8f189b673b5a958aefd4f7149 100644 (file)
--- a/tests/expected/libmount/context-utab
+++ b/tests/expected/libmount/context-utab
@@ -1,5 +1,4 @@
 Create partitions
 Create filesystem
 Do tests...
-Create filesystem [btrfs]
 ...done.

diff --git a/tests/expected/libmount/context-utab-py b/tests/expected/libmount/context-utab-py
index 10d4d566a862b9a7b00fd7067b4473f7af26504a..7b403e5551d3a7c8f189b673b5a958aefd4f7149 100644 (file)
--- a/tests/expected/libmount/context-utab-py
+++ b/tests/expected/libmount/context-utab-py
@@ -1,5 +1,4 @@
 Create partitions
 Create filesystem
 Do tests...
-Create filesystem [btrfs]
 ...done.

diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 4eb68ffcb4c305181606ec6a0b7d5ceaf00219f6..91a2404258094d57da33cbc1962345b94081740c 100755 (executable)
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -15,7 +15,6 @@ ts_check_test_command "$TS_CMD_UUIDGEN"
 
 ts_skip_nonroot
 ts_check_prog "mkfs.ext4"
-ts_check_prog "mkfs.btrfs"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
 LABEL=libmount-test
@@ -25,7 +24,7 @@ MOUNTPOINT="$TS_MOUNTPOINT"
 [ -x $TESTPROG ] || ts_skip "test not compiled"
 
 # set global variable TS_DEVICE
-ts_scsi_debug_init dev_size_mb=100
+ts_scsi_debug_init dev_size_mb=257
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
@@ -94,37 +93,39 @@ grep -q $DEVICE $LIBMOUNT_UTAB && \
 ts_finalize_subtest
 
 
-$TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
-ts_log "Create filesystem [btrfs]"
-mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
-udevadm settle
-
-mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
-btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
-umount $MOUNTPOINT &> /dev/null
-
-udevadm settle
-
-ts_init_subtest "mount-uhelper-subvol"
-mkdir -p $MOUNTPOINT &>  /dev/null
-ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> $TS_OUTPUT 2>&1
-grep -q $DEVICE $LIBMOUNT_UTAB || \
-       echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
-ts_finalize_subtest
-
-# 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"
-ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1
-grep -q $DEVICE $LIBMOUNT_UTAB && \
-       echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
-ts_finalize_subtest
+if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
+       $TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
+       #ts_log "Create filesystem [btrfs]"
+       mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
+       udevadm settle
+
+       mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
+       btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
+       umount $MOUNTPOINT &> /dev/null
+
+       udevadm settle
+
+       ts_init_subtest "mount-uhelper-subvol"
+       mkdir -p $MOUNTPOINT &>  /dev/null
+       ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> $TS_OUTPUT 2>&1
+       grep -q $DEVICE $LIBMOUNT_UTAB || \
+               echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
+       ts_finalize_subtest
+
+       # 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"
+       ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1
+       grep -q $DEVICE $LIBMOUNT_UTAB && \
+               echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
+       ts_finalize_subtest
+fi
 
 ts_log "...done."
 rmmod scsi_debug

diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index b781fafd3a4845c9f9264f5648da28abb9f9f8ce..ae565ad86dbda1a02b7a3ba2f019b5b67f6dd49b 100755 (executable)
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -14,7 +14,6 @@ ts_check_test_command "$TS_CMD_UUIDGEN"
 
 ts_skip_nonroot
 ts_check_prog "mkfs.ext4"
-ts_check_prog "mkfs.btrfs"
 
 ts_init_py libmount
 
@@ -26,7 +25,7 @@ UUID=$($TS_CMD_UUIDGEN)
 MOUNTPOINT="$TS_MOUNTPOINT"
 
 # set global variable TS_DEVICE
-ts_scsi_debug_init dev_size_mb=100
+ts_scsi_debug_init dev_size_mb=257
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
@@ -95,38 +94,39 @@ grep -q $DEVICE $LIBMOUNT_UTAB && \
 ts_finalize_subtest
 
 
-$TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
-ts_log "Create filesystem [btrfs]"
-mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
-udevadm settle
-
-mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
-btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
-umount $MOUNTPOINT &> /dev/null
-
-udevadm settle
-
-ts_init_subtest "mount-uhelper-subvol"
-mkdir -p $MOUNTPOINT &>  /dev/null
-$PYTHON $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> $TS_OUTPUT 2>&1
-grep -q $DEVICE $LIBMOUNT_UTAB || \
-       echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
-ts_finalize_subtest
-
-
-# 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
-grep -q $DEVICE $LIBMOUNT_UTAB && \
-       echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
-ts_finalize_subtest
+if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
+       $TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
+       #ts_log "Create filesystem [btrfs]"
+       mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
+       udevadm settle
+
+       mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
+       btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
+       umount $MOUNTPOINT &> /dev/null
+
+       udevadm settle
+
+       ts_init_subtest "mount-uhelper-subvol"
+       mkdir -p $MOUNTPOINT &>  /dev/null
+       $PYTHON $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> $TS_OUTPUT 2>&1
+       grep -q $DEVICE $LIBMOUNT_UTAB || \
+               echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
+       ts_finalize_subtest
+
+       # 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
+       grep -q $DEVICE $LIBMOUNT_UTAB && \
+               echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
+       ts_finalize_subtest
+fi
 
 ts_log "...done."
 rmmod scsi_debug

diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs
index 30aed1d3266074e5ba8ecbf2d134c3d796bd3d6f..6abbd0be1de3142209cc7c20b1d9a76ca84531f8 100755 (executable)
--- a/tests/ts/mount/fstab-btrfs
+++ b/tests/ts/mount/fstab-btrfs
@@ -30,8 +30,10 @@ 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"
+if ! btrfs inspect-internal --help &>/dev/null || \
+   btrfs inspect-internal rootid bla 2>&1 | grep -q "unknown token"; then
+       ts_skip "btrfs too old"
+fi
 
 TS_MOUNTPOINT_ANY="$TS_MOUNTPOINT"
 TS_MOUNTPOINT_CREATE="$TS_MOUNTPOINT-create"
@@ -62,7 +64,7 @@ mkdir bind-point
 mkdir -p d1/dd1/ddd1
 cd ./d1/dd1/ddd1
 btrfs subvol create s2 >/dev/null
-DEFAULT_SUBVOLID=$(btrfs inspect rootid s2)
+DEFAULT_SUBVOLID=$(btrfs inspect-internal rootid s2)
 btrfs subvol set-default $DEFAULT_SUBVOLID . >/dev/null
 NON_DEFAULT_SUBVOLID=$(btrfs subvol list "$TS_MOUNTPOINT_CREATE" | while read dummy id rest ; do if test $id = $DEFAULT_SUBVOLID ; then continue ; fi ; echo $id ; done)
 cd ../../../..