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 271d86bc79cf6c354cd2c3192dd33a5f2c32b5d6..6fdf7c168ec75d3a67d6f93ca6d67e77a923300e 100644 (file)
--- 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 c6dffdbeb99bf8a0f3af78253b5f5979d56e9303..6185b6bda6808d0dd3c3881538a9b9bc2e6072ef 100644 (file)
--- 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 ee7fb86fe761d2721e76d519cf808bfba0e9b2f7..c397b2363868120d869ad6f1980c9606ad18c98a 100644 (file)
--- 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 520324acf55470a0b249e4019ab328344ee7033c..1784e00090ffd135124002c201992d1772402f43 100644 (file)
--- 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 316d129f1cdd6651e857c401c2b8348b01721a04..12917cce25ac6af60758f0d9e535d1589c3d6b7a 100644 (file)
--- 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 c5573eaadcf94a27a7c4fbaa8b3c7072af44ad3c..737e2a339bc30353f10919ee3b06e18c2ce417be 100644 (file)
--- 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 db0369305311df8902454203eb96f3e6d8c7a348..333605aa9efd84bab95c034645317437caaf9621 100755 (executable)
--- 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