From: Karel Zak <kzak@redhat.com>
Date: Thu, 15 Nov 2012 15:42:56 +0000 (+0100)
Subject: tests: add shared subtrees to umount --recursive test
X-Git-Tag: v2.23-rc1~518
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dd72c98349b58d5eb34180029e0b9ca1e13b981;p=thirdparty%2Futil-linux.git

tests: add shared subtrees to umount --recursive test

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

diff --git a/tests/expected/mount/umount-recursive b/tests/expected/mount/umount-recursive
index 86bccc81b3..6a95d56dbf 100644
--- a/tests/expected/mount/umount-recursive
+++ b/tests/expected/mount/umount-recursive
@@ -7,6 +7,8 @@ Create filesystem D
 Do tests...
 A) Mount root
 B) Mount child
+B2) Mount child-bind
 C) Mount child/child
 D) Mount child/child
+E) Mount child-bind
 Success
diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index c01cc6a113..53b0b39e02 100755
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -66,17 +66,26 @@ ts_log "Do tests..."
 
 ts_log "A) Mount root"
 $TS_CMD_MOUNT ${DEVICE}1 $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1
+$TS_CMD_MOUNT --make-shared $TS_MOUNTPOINT
 
 ts_log "B) Mount child"
 mkdir -p $TS_MOUNTPOINT/mntB
 $TS_CMD_MOUNT ${DEVICE}2 $TS_MOUNTPOINT/mntB >> $TS_OUTPUT 2>&1
 
+ts_log "B2) Mount child-bind"
+mkdir -p $TS_MOUNTPOINT/bindB
+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB $TS_MOUNTPOINT/bindB >> $TS_OUTPUT 2>&1
+
 ts_log "C) Mount child/child"
 mkdir -p $TS_MOUNTPOINT/mntB/mnt{C,D}
 $TS_CMD_MOUNT ${DEVICE}3 $TS_MOUNTPOINT/mntB/mntC >> $TS_OUTPUT 2>&1
 
 ts_log "D) Mount child/child"
-$TS_CMD_MOUNT ${DEVICE}3 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>&1
+$TS_CMD_MOUNT ${DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>&1
+
+ts_log "E) Mount child-bind"
+mkdir -p $TS_MOUNTPOINT/bindC
+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB/mntC $TS_MOUNTPOINT/bindC
 
 $TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1
 [ $? == 0 ] || ts_die "umount failed"