From: Karel Zak <kzak@redhat.com>
Date: Thu, 12 Jan 2012 20:51:29 +0000 (+0100)
Subject: tests: fix mount/special to be compatible with libmount
X-Git-Tag: v2.21-rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd693adddcd770d4717524f2701a24032a7d6cd;p=thirdparty%2Futil-linux.git

tests: fix mount/special to be compatible with libmount

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

diff --git a/tests/expected/mount/special b/tests/expected/mount/special
index e50c64cd0e..99997d354f 100644
--- a/tests/expected/mount/special
+++ b/tests/expected/mount/special
@@ -1,17 +1 @@
-mount: fstab path: "/etc/fstab"
-mount: mtab path:  "/etc/mtab"
-mount: lock path:  "/etc/mtab~"
-mount: temp path:  "/etc/mtab.tmp"
-mount: UID:        0
-mount: eUID:       0
-mount: spec:  "/foo"
-mount: node:  "/bar"
-mount: types: "mytest"
-mount: opts:  "(null)"
-mount: external mount: argv[0] = "/sbin/mount.mytest"
-mount: external mount: argv[1] = "/foo"
-mount: external mount: argv[2] = "/bar"
-mount: external mount: argv[3] = "-v"
-mount: external mount: argv[4] = "-o"
-mount: external mount: argv[5] = "rw"
-/sbin/mount.mytest called with "/foo /bar -v -o rw"
+/sbin/mount.mytest called with "/foo /bar -o rw"
diff --git a/tests/ts/mount/special b/tests/ts/mount/special
index 76b07964cd..6e198b3b38 100755
--- a/tests/ts/mount/special
+++ b/tests/ts/mount/special
@@ -32,7 +32,7 @@ echo "$0 called with \"$*\""
 EOF
 chmod +x $MOUNTER
 
-$TS_CMD_MOUNT -v -v -v -t mytest  /foo /bar &> $TS_OUTPUT
+$TS_CMD_MOUNT -t mytest /foo /bar &> $TS_OUTPUT
 
 rm -f $MOUNTER