From: Karel Zak <kzak@redhat.com>
Date: Thu, 25 Apr 2013 09:07:05 +0000 (+0200)
Subject: tests: make mount tests backwardly compatible with deprecated-mount/
X-Git-Tag: v2.23~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d426ddbd5fd10bc5bc92ded9e0a92d0af13870ad;p=thirdparty%2Futil-linux.git

tests: make mount tests backwardly compatible with deprecated-mount/

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

diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index 3eae9b7ca0..995aed2049 100755
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -58,20 +58,25 @@ mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
 ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
 
 
-ts_init_subtest "mount-private"
-$TS_CMD_MOUNT --make-private --make-unbindable \
-	      $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
-$TS_CMD_UMOUNT $MOUNTPOINT
-ts_finalize_subtest
-
-ts_init_subtest "mount-private-ro"
-$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT
-$TS_CMD_UMOUNT $MOUNTPOINT
-ts_finalize_subtest
-
+# multiple propagation flags for one mount(8) call is unsupported
+# by old mount-deprecated/mount
+$TS_CMD_MOUNT -V | grep -q libmount
+if [ $? -eq 0 ]; then
+
+	ts_init_subtest "mount-private"
+	$TS_CMD_MOUNT --make-private --make-unbindable \
+		      $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1
+	$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+	$TS_CMD_UMOUNT $MOUNTPOINT
+	ts_finalize_subtest
+
+	ts_init_subtest "mount-private-ro"
+	$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>&1
+	$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+	$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT
+	$TS_CMD_UMOUNT $MOUNTPOINT
+	ts_finalize_subtest
+fi
 
 ts_device_deinit $DEVICE
 rmdir $MOUNTPOINT
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 1b09112d42..434ecab2d6 100755
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -9,6 +9,9 @@ TS_DESC="umount-all-targets"
 ts_init "$*"
 ts_skip_nonroot
 
+$TS_CMD_UMOUNT --help | grep -q all-targets
+[ $? -eq 1 ] && ts_skip "all-targets unsupported"
+
 DEVICE=$(ts_scsi_debug_init dev_size_mb=50)
 
 ts_log "Create partitions"
diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index 128df885a6..85e54df7a9 100755
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -9,6 +9,9 @@ TS_DESC="umount-recursive"
 ts_init "$*"
 ts_skip_nonroot
 
+$TS_CMD_UMOUNT --help | grep -q recursive
+[ $? -eq 1 ] && ts_skip "recursive unsupported"
+
 ts_log "Init device"
 DEVICE=$(ts_scsi_debug_init dev_size_mb=50)