From: Karel Zak <kzak@redhat.com>
Date: Thu, 21 Jul 2011 20:29:26 +0000 (+0200)
Subject: tests: add 'none' source to libmount update tests
X-Git-Tag: v2.20-rc1~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b59994b0eb9494cb2c8c440b2c685999c722c74c;p=thirdparty%2Futil-linux.git

tests: add 'none' source to libmount update tests

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

diff --git a/tests/expected/libmount/update-mtab-mount b/tests/expected/libmount/update-mtab-mount
index 271d86bc79..6fdf7c168e 100644
--- a/tests/expected/libmount/update-mtab-mount
+++ b/tests/expected/libmount/update-mtab-mount
@@ -2,3 +2,4 @@
 /dev/sdb1 /mnt/bar ext3 ro,noatime,gg=G,ffff=f 0 0
 /dev/sda2 /mnt/bar ext3 rw,noatime 0 0
 /dev/sda1 /mnt/gogo ext3 rw,noatime,nosuid 0 0
+none /proc proc rw 0 0
diff --git a/tests/expected/libmount/update-mtab-move b/tests/expected/libmount/update-mtab-move
index c6dffdbeb9..6185b6bda6 100644
--- a/tests/expected/libmount/update-mtab-move
+++ b/tests/expected/libmount/update-mtab-move
@@ -2,3 +2,4 @@
 /dev/sdb1 /mnt/bar ext3 ro,noatime,gg=G,ffff=f 0 0
 /dev/sda2 /mnt/newbar ext3 rw,noatime 0 0
 /dev/sda1 /mnt/gogo ext3 rw,noatime,nosuid 0 0
+none /proc proc rw 0 0
diff --git a/tests/expected/libmount/update-mtab-remount b/tests/expected/libmount/update-mtab-remount
index ee7fb86fe7..c397b23638 100644
--- a/tests/expected/libmount/update-mtab-remount
+++ b/tests/expected/libmount/update-mtab-remount
@@ -2,3 +2,4 @@
 /dev/sdb1 /mnt/bar ext3 rw,atime,nosuid 0 0
 /dev/sda2 /mnt/newbar ext3 rw,noatime 0 0
 /dev/sda1 /mnt/gogo ext3 rw,noatime,nosuid 0 0
+none /proc proc rw 0 0
diff --git a/tests/expected/libmount/update-utab-mount b/tests/expected/libmount/update-utab-mount
index 520324acf5..1784e00090 100644
--- a/tests/expected/libmount/update-utab-mount
+++ b/tests/expected/libmount/update-utab-mount
@@ -1,2 +1,3 @@
 SRC=/dev/sdb1 TARGET=/mnt/bar ROOT=/ OPTS=user
 SRC=/dev/sda2 TARGET=/mnt/xyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal
+TARGET=/proc ROOT=/ OPTS=user
diff --git a/tests/expected/libmount/update-utab-move b/tests/expected/libmount/update-utab-move
index 316d129f1c..12917cce25 100644
--- a/tests/expected/libmount/update-utab-move
+++ b/tests/expected/libmount/update-utab-move
@@ -1,2 +1,3 @@
 SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user
 SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal
+TARGET=/proc ROOT=/ OPTS=user
diff --git a/tests/expected/libmount/update-utab-remount b/tests/expected/libmount/update-utab-remount
index c5573eaadc..737e2a339b 100644
--- a/tests/expected/libmount/update-utab-remount
+++ b/tests/expected/libmount/update-utab-remount
@@ -1,2 +1,3 @@
 SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user
 SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=user
+TARGET=/proc ROOT=/ OPTS=user
diff --git a/tests/ts/libmount/update b/tests/ts/libmount/update
index db03693053..333605aa9e 100755
--- a/tests/ts/libmount/update
+++ b/tests/ts/libmount/update
@@ -34,6 +34,7 @@ $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec"
 $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "gg=G,ffff=f,ro,noatime"
 $TESTPROG --add /dev/sda2 /mnt/bar ext3 "rw,noatime"
 $TESTPROG --add /dev/sda1 /mnt/gogo ext3 "rw,noatime,nosuid"
+$TESTPROG --add none /proc proc defaults
 cp $LIBMOUNT_MTAB $TS_OUTPUT	# save the mtab aside
 ts_finalize_subtest		# checks the mtab
 
@@ -52,6 +53,7 @@ ts_finalize_subtest		# checks the mtab
 ts_init_subtest "mtab-umount"
 $TESTPROG --remove /mnt/bar
 $TESTPROG --remove /mnt/gogo
+$TESTPROG --remove /proc
 cp $LIBMOUNT_MTAB $TS_OUTPUT	# save the mtab aside
 ts_finalize_subtest		# checks the mtab
 
@@ -69,6 +71,7 @@ ts_init_subtest "utab-mount"
 $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec"
 $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "ro,user"
 $TESTPROG --add /dev/sda2 /mnt/xyz ext3 "rw,loop=/dev/loop0,uhelper=hal"
+$TESTPROG --add none /proc proc "rw,user"
 cp $LIBMOUNT_UTAB $TS_OUTPUT	# save the mtab aside
 ts_finalize_subtest		# checks the mtab
 
@@ -86,6 +89,7 @@ ts_finalize_subtest		# checks the mtab
 
 ts_init_subtest "utab-umount"
 $TESTPROG --remove /mnt/newbar
+$TESTPROG --remove /proc
 cp $LIBMOUNT_UTAB $TS_OUTPUT	# save the mtab aside
 ts_finalize_subtest		# checks the mtab