From: Karel Zak Date: Thu, 22 Dec 2016 10:52:22 +0000 (+0100) Subject: tests: add findmnt output tests X-Git-Tag: v2.30-rc1~334 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eac414038e03971141971e8dfa43471a92ca6d96;p=thirdparty%2Futil-linux.git tests: add findmnt output tests Signed-off-by: Karel Zak --- diff --git a/tests/expected/findmnt/outputs-default b/tests/expected/findmnt/outputs-default new file mode 100644 index 0000000000..59495797bd --- /dev/null +++ b/tests/expected/findmnt/outputs-default @@ -0,0 +1,35 @@ +TARGET SOURCE FSTYPE OPTIONS +/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered +|-/proc /proc proc rw,relatime +| |-/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| | `-/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime +| `-/proc/bus/usb /proc/bus/usb usbfs rw,relatime +|-/sys /sys sysfs rw,relatime +| |-/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755 +| | |-/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd +| | |-/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset +| | |-/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns +| | |-/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu +| | |-/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct +| | |-/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory +| | |-/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices +| | |-/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer +| | |-/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls +| | `-/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio +| |-/sys/kernel/security systemd-1 autofs rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| |-/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| `-/sys/fs/fuse/connections fusectl fusectl rw,relatime +|-/dev udev devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755 +| |-/dev/pts devpts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 +| |-/dev/shm tmpfs tmpfs rw,relatime +| |-/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| | `-/dev/hugepages hugetlbfs hugetlbfs rw,relatime +| `-/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| `-/dev/mqueue mqueue mqueue rw,relatime +|-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered +|-/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered +| `-/home/kzak/.gvfs gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500 +|-/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime +|-/mnt/sounds //foo.home/bar/ cifs rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344 +`-/mnt/foo /fooooo bar rw,relatime +rc=0 diff --git a/tests/expected/findmnt/outputs-force-tree b/tests/expected/findmnt/outputs-force-tree new file mode 100644 index 0000000000..59495797bd --- /dev/null +++ b/tests/expected/findmnt/outputs-force-tree @@ -0,0 +1,35 @@ +TARGET SOURCE FSTYPE OPTIONS +/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered +|-/proc /proc proc rw,relatime +| |-/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| | `-/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime +| `-/proc/bus/usb /proc/bus/usb usbfs rw,relatime +|-/sys /sys sysfs rw,relatime +| |-/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755 +| | |-/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd +| | |-/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset +| | |-/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns +| | |-/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu +| | |-/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct +| | |-/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory +| | |-/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices +| | |-/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer +| | |-/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls +| | `-/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio +| |-/sys/kernel/security systemd-1 autofs rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| |-/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| `-/sys/fs/fuse/connections fusectl fusectl rw,relatime +|-/dev udev devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755 +| |-/dev/pts devpts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 +| |-/dev/shm tmpfs tmpfs rw,relatime +| |-/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| | `-/dev/hugepages hugetlbfs hugetlbfs rw,relatime +| `-/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| `-/dev/mqueue mqueue mqueue rw,relatime +|-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered +|-/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered +| `-/home/kzak/.gvfs gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500 +|-/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime +|-/mnt/sounds //foo.home/bar/ cifs rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344 +`-/mnt/foo /fooooo bar rw,relatime +rc=0 diff --git a/tests/expected/findmnt/outputs-kernel b/tests/expected/findmnt/outputs-kernel new file mode 100644 index 0000000000..59495797bd --- /dev/null +++ b/tests/expected/findmnt/outputs-kernel @@ -0,0 +1,35 @@ +TARGET SOURCE FSTYPE OPTIONS +/ /dev/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered +|-/proc /proc proc rw,relatime +| |-/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| | `-/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime +| `-/proc/bus/usb /proc/bus/usb usbfs rw,relatime +|-/sys /sys sysfs rw,relatime +| |-/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755 +| | |-/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd +| | |-/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset +| | |-/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns +| | |-/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu +| | |-/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct +| | |-/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory +| | |-/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices +| | |-/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer +| | |-/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls +| | `-/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio +| |-/sys/kernel/security systemd-1 autofs rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| |-/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| `-/sys/fs/fuse/connections fusectl fusectl rw,relatime +|-/dev udev devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755 +| |-/dev/pts devpts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 +| |-/dev/shm tmpfs tmpfs rw,relatime +| |-/dev/hugepages systemd-1 autofs rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| | `-/dev/hugepages hugetlbfs hugetlbfs rw,relatime +| `-/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +| `-/dev/mqueue mqueue mqueue rw,relatime +|-/boot /dev/sda6 ext3 rw,noatime,errors=continue,barrier=0,data=ordered +|-/home/kzak /dev/mapper/kzak-home ext4 rw,noatime,barrier=1,data=ordered +| `-/home/kzak/.gvfs gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500 +|-/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime +|-/mnt/sounds //foo.home/bar/ cifs rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344 +`-/mnt/foo /fooooo bar rw,relatime +rc=0 diff --git a/tests/expected/findmnt/outputs-submounts b/tests/expected/findmnt/outputs-submounts new file mode 100644 index 0000000000..d7661e3889 --- /dev/null +++ b/tests/expected/findmnt/outputs-submounts @@ -0,0 +1,17 @@ +TARGET SOURCE FSTYPE OPTIONS +/sys /sys sysfs rw,relatime +|-/sys/fs/cgroup tmpfs tmpfs rw,nosuid,nodev,noexec,relatime,mode=755 +| |-/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd +| |-/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuset +| |-/sys/fs/cgroup/ns cgroup cgroup rw,nosuid,nodev,noexec,relatime,ns +| |-/sys/fs/cgroup/cpu cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpu +| |-/sys/fs/cgroup/cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime,cpuacct +| |-/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime,memory +| |-/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime,devices +| |-/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime,freezer +| |-/sys/fs/cgroup/net_cls cgroup cgroup rw,nosuid,nodev,noexec,relatime,net_cls +| `-/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio +|-/sys/kernel/security systemd-1 autofs rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +|-/sys/kernel/debug systemd-1 autofs rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct +`-/sys/fs/fuse/connections fusectl fusectl rw,relatime +rc=0 diff --git a/tests/ts/findmnt/outputs b/tests/ts/findmnt/outputs new file mode 100755 index 0000000000..818d7194ae --- /dev/null +++ b/tests/ts/findmnt/outputs @@ -0,0 +1,44 @@ +#!/bin/bash + +# This file is part of util-linux. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +TS_TOPDIR="${0%/*}/../.." +TS_DESC="outputs" + +. $TS_TOPDIR/functions.sh +ts_init "$*" + +ts_check_test_command "$TS_CMD_FINDMNT" + + +ts_init_subtest "default" +$TS_CMD_FINDMNT --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT +echo rc=$? >> $TS_OUTPUT +ts_finalize_subtest + +ts_init_subtest "kernel" +$TS_CMD_FINDMNT --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT +echo rc=$? >> $TS_OUTPUT +ts_finalize_subtest + +ts_init_subtest "force-tree" +$TS_CMD_FINDMNT --tree --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT +echo rc=$? >> $TS_OUTPUT +ts_finalize_subtest + +ts_init_subtest "submounts" +$TS_CMD_FINDMNT /sys --submounts --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT +echo rc=$? >> $TS_OUTPUT +ts_finalize_subtest + +ts_finalize