--- /dev/null
+{
+ "mountinfo": [
+ {
+ "target": "/sys",
+ "source": "sysfs",
+ "type": "sysfs",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/proc",
+ "source": "proc",
+ "type": "proc",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/dev",
+ "source": "devtmpfs",
+ "type": "devtmpfs",
+ "vfs-opts": "rw,nosuid"
+ },{
+ "target": "/sys/kernel/security",
+ "source": "securityfs",
+ "type": "securityfs",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/dev/shm",
+ "source": "tmpfs",
+ "type": "tmpfs",
+ "vfs-opts": "rw,nosuid,nodev"
+ },{
+ "target": "/dev/pts",
+ "source": "devpts",
+ "type": "devpts",
+ "vfs-opts": "rw,nosuid,noexec,relatime"
+ },{
+ "target": "/run",
+ "source": "tmpfs",
+ "type": "tmpfs",
+ "vfs-opts": "rw,nosuid,nodev"
+ },{
+ "target": "/sys/fs/cgroup",
+ "source": "tmpfs",
+ "type": "tmpfs",
+ "vfs-opts": "ro,nosuid,nodev,noexec"
+ },{
+ "target": "/sys/fs/cgroup/systemd",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/pstore",
+ "source": "pstore",
+ "type": "pstore",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/firmware/efi/efivars",
+ "source": "efivarfs",
+ "type": "efivarfs",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/blkio",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/cpu,cpuacct",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/devices",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/hugetlb",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/pids",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/memory",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/cpuset",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/perf_event",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/net_cls,net_prio",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/fs/cgroup/freezer",
+ "source": "cgroup",
+ "type": "cgroup",
+ "vfs-opts": "rw,nosuid,nodev,noexec,relatime"
+ },{
+ "target": "/sys/kernel/config",
+ "source": "configfs",
+ "type": "configfs",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/",
+ "source": "/dev/sda4",
+ "type": "ext4",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/proc/sys/fs/binfmt_misc",
+ "source": "systemd-1",
+ "type": "autofs",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/sys/kernel/debug",
+ "source": "debugfs",
+ "type": "debugfs",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/dev/hugepages",
+ "source": "hugetlbfs",
+ "type": "hugetlbfs",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/dev/mqueue",
+ "source": "mqueue",
+ "type": "mqueue",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/proc/sys/fs/binfmt_misc",
+ "source": "binfmt_misc",
+ "type": "binfmt_misc",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/proc/fs/nfsd",
+ "source": "nfsd",
+ "type": "nfsd",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/tmp",
+ "source": "tmpfs",
+ "type": "tmpfs",
+ "vfs-opts": "rw,nosuid,nodev"
+ },{
+ "target": "/home",
+ "source": "/dev/sda3",
+ "type": "ext4",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/boot",
+ "source": "/dev/sda2",
+ "type": "ext4",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/home/games",
+ "source": "/dev/sda5",
+ "type": "ext4",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/boot/efi",
+ "source": "/dev/sda1",
+ "type": "vfat",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/home/archive",
+ "source": "/dev/sdb1",
+ "type": "ext4",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/var/lib/nfs/rpc_pipefs",
+ "source": "sunrpc",
+ "type": "rpc_pipefs",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/sys/fs/fuse/connections",
+ "source": "fusectl",
+ "type": "fusectl",
+ "vfs-opts": "rw,relatime"
+ },{
+ "target": "/run/user/1000",
+ "source": "tmpfs",
+ "type": "tmpfs",
+ "vfs-opts": "rw,nosuid,nodev,relatime"
+ },{
+ "target": "/run/user/1000/gvfs",
+ "source": "gvfsd-fuse",
+ "type": "fuse.gvfsd-fuse",
+ "vfs-opts": "rw,nosuid,nodev,relatime"
+ },{
+ "target": "/run/user/0",
+ "source": "tmpfs",
+ "type": "tmpfs",
+ "vfs-opts": "rw,nosuid,nodev,relatime"
+ },{
+ "target": "/mnt/sounds",
+ "source": "//sr.net.home/sounds",
+ "type": "cifs",
+ "vfs-opts": "rw,relatime"
+ }
+ ]
+}
--- /dev/null
+ID PARENT MAJMIN ROOT TARGET VFS-OPTS PROP SEP TYPE SOURCE FS-OPTS
+17 62 0:17 / /sys rw,nosuid,nodev,noexec,relatime shared:6 - sysfs sysfs rw
+18 62 0:4 / /proc rw,nosuid,nodev,noexec,relatime shared:5 - proc proc rw
+19 62 0:6 / /dev rw,nosuid shared:2 - devtmpfs devtmpfs rw,size=8175740k,nr_inodes=2043935,mode=755
+20 17 0:18 / /sys/kernel/security rw,nosuid,nodev,noexec,relatime shared:7 - securityfs securityfs rw
+21 19 0:19 / /dev/shm rw,nosuid,nodev shared:3 - tmpfs tmpfs rw
+22 19 0:20 / /dev/pts rw,nosuid,noexec,relatime shared:4 - devpts devpts rw,gid=5,mode=620,ptmxmode=000
+23 62 0:21 / /run rw,nosuid,nodev shared:23 - tmpfs tmpfs rw,mode=755
+24 17 0:22 / /sys/fs/cgroup ro,nosuid,nodev,noexec shared:8 - tmpfs tmpfs ro,mode=755
+25 24 0:23 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:9 - cgroup cgroup rw,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
+26 17 0:24 / /sys/fs/pstore rw,nosuid,nodev,noexec,relatime shared:20 - pstore pstore rw
+27 17 0:25 / /sys/firmware/efi/efivars rw,nosuid,nodev,noexec,relatime shared:21 - efivarfs efivarfs rw
+28 24 0:26 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:10 - cgroup cgroup rw,blkio
+29 24 0:27 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:11 - cgroup cgroup rw,cpu,cpuacct
+30 24 0:28 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:12 - cgroup cgroup rw,devices
+31 24 0:29 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:13 - cgroup cgroup rw,hugetlb
+32 24 0:30 / /sys/fs/cgroup/pids rw,nosuid,nodev,noexec,relatime shared:14 - cgroup cgroup rw,pids
+33 24 0:31 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:15 - cgroup cgroup rw,memory
+34 24 0:32 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,cpuset
+35 24 0:33 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:17 - cgroup cgroup rw,perf_event
+36 24 0:34 / /sys/fs/cgroup/net_cls,net_prio rw,nosuid,nodev,noexec,relatime shared:18 - cgroup cgroup rw,net_cls,net_prio
+37 24 0:35 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:19 - cgroup cgroup rw,freezer
+60 17 0:36 / /sys/kernel/config rw,relatime shared:22 - configfs configfs rw
+62 0 8:4 / / rw,relatime shared:1 - ext4 /dev/sda4 rw,data=ordered
+38 18 0:37 / /proc/sys/fs/binfmt_misc rw,relatime shared:24 - autofs systemd-1 rw,fd=37,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=12781
+39 17 0:7 / /sys/kernel/debug rw,relatime shared:25 - debugfs debugfs rw
+40 19 0:38 / /dev/hugepages rw,relatime shared:26 - hugetlbfs hugetlbfs rw
+41 19 0:16 / /dev/mqueue rw,relatime shared:27 - mqueue mqueue rw
+42 38 0:39 / /proc/sys/fs/binfmt_misc rw,relatime shared:28 - binfmt_misc binfmt_misc rw
+75 18 0:40 / /proc/fs/nfsd rw,relatime shared:29 - nfsd nfsd rw
+77 62 0:41 / /tmp rw,nosuid,nodev shared:30 - tmpfs tmpfs rw
+80 62 8:3 / /home rw,relatime shared:31 - ext4 /dev/sda3 rw,data=ordered
+81 62 8:2 / /boot rw,relatime shared:32 - ext4 /dev/sda2 rw,data=ordered
+84 80 8:5 / /home/games rw,relatime shared:33 - ext4 /dev/sda5 rw,data=ordered
+86 81 8:1 / /boot/efi rw,relatime shared:34 - vfat /dev/sda1 rw,fmask=0077,dmask=0077,codepage=437,iocharset=ascii,shortname=winnt,errors=remount-ro
+88 80 8:17 / /home/archive rw,relatime shared:35 - ext4 /dev/sdb1 rw,data=ordered
+90 62 0:43 / /var/lib/nfs/rpc_pipefs rw,relatime shared:36 - rpc_pipefs sunrpc rw
+223 17 0:47 / /sys/fs/fuse/connections rw,relatime shared:163 - fusectl fusectl rw
+217 23 0:46 / /run/user/1000 rw,nosuid,nodev,relatime shared:158 - tmpfs tmpfs rw,size=1637324k,mode=700,uid=1000,gid=1000
+203 217 0:45 / /run/user/1000/gvfs rw,nosuid,nodev,relatime shared:153 - fuse.gvfsd-fuse gvfsd-fuse rw,user_id=1000,group_id=1000
+171 23 0:44 / /run/user/0 rw,nosuid,nodev,relatime shared:114 - tmpfs tmpfs rw,size=1637324k,mode=700
+177 62 0:48 / /mnt/sounds rw,relatime shared:119 - cifs //sr.net.home/sounds rw,vers=1.0,cache=strict,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,unix,posixpaths,serverino,mapposix,acl,rsize=1048576,wsize=65536,echo_interval=60,actimeo=1
--- /dev/null
+TARGET SOURCE TYPE VFS-OPTS
+/sys sysfs sysfs rw,nosuid,nodev,noexec,relatime
+/proc proc proc rw,nosuid,nodev,noexec,relatime
+/dev devtmpfs devtmpfs rw,nosuid
+/sys/kernel/security securityfs securityfs rw,nosuid,nodev,noexec,relatime
+/dev/shm tmpfs tmpfs rw,nosuid,nodev
+/dev/pts devpts devpts rw,nosuid,noexec,relatime
+/run tmpfs tmpfs rw,nosuid,nodev
+/sys/fs/cgroup tmpfs tmpfs ro,nosuid,nodev,noexec
+/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/pstore pstore pstore rw,nosuid,nodev,noexec,relatime
+/sys/firmware/efi/efivars efivarfs efivarfs rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/cpu,cpuacct cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/devices cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/hugetlb cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/pids cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/memory cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/cpuset cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/perf_event cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/net_cls,net_prio cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/fs/cgroup/freezer cgroup cgroup rw,nosuid,nodev,noexec,relatime
+/sys/kernel/config configfs configfs rw,relatime
+/ /dev/sda4 ext4 rw,relatime
+/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime
+/sys/kernel/debug debugfs debugfs rw,relatime
+/dev/hugepages hugetlbfs hugetlbfs rw,relatime
+/dev/mqueue mqueue mqueue rw,relatime
+/proc/sys/fs/binfmt_misc binfmt_misc binfmt_misc rw,relatime
+/proc/fs/nfsd nfsd nfsd rw,relatime
+/tmp tmpfs tmpfs rw,nosuid,nodev
+/home /dev/sda3 ext4 rw,relatime
+/boot /dev/sda2 ext4 rw,relatime
+/home/games /dev/sda5 ext4 rw,relatime
+/boot/efi /dev/sda1 vfat rw,relatime
+/home/archive /dev/sdb1 ext4 rw,relatime
+/var/lib/nfs/rpc_pipefs sunrpc rpc_pipefs rw,relatime
+/sys/fs/fuse/connections fusectl fusectl rw,relatime
+/run/user/1000 tmpfs tmpfs rw,nosuid,nodev,relatime
+/run/user/1000/gvfs gvfsd-fuse fuse.gvfsd-fuse rw,nosuid,nodev,relatime
+/run/user/0 tmpfs tmpfs rw,nosuid,nodev,relatime
+/mnt/sounds //sr.net.home/sounds cifs rw,relatime
ts_finalize_subtest
ts_init_subtest "input-separator"
-$TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --input-separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>> $TS_ERRLOG
ts_finalize_subtest
ts_init_subtest "input-separator-space"
ts_finalize_subtest
ts_init_subtest "empty-lines"
-$TS_CMD_COLUMN --table --table-empty-lines $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --table --keep-empty-lines $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>> $TS_ERRLOG
ts_finalize_subtest
ts_init_subtest "noempty-lines"
>> $TS_OUTPUT 2>> $TS_ERRLOG
ts_finalize_subtest
+ts_init_subtest "limit"
+$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \
+ --table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \
+ --table-columns-limit 2 \
+ --output-width 110 \
+ >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_finalize_subtest
+
ts_init_subtest "tree"
$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \
--table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \
>> $TS_OUTPUT 2>> $TS_ERRLOG
ts_finalize_subtest
+ts_init_subtest "json"
+$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \
+ --table-name "mountinfo" \
+ --table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \
+ --table-hide=SEP,ID,PARENT,ROOT,PROP,FS-OPTS,MAJMIN \
+ --table-order TARGET,SOURCE,TYPE,VFS-OPTS \
+ --json \
+ --output-width 110 \
+ >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_finalize_subtest
+
+ts_init_subtest "use-spaces"
+$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \
+ --table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \
+ --table-hide=SEP,ID,PARENT,ROOT,PROP,FS-OPTS,MAJMIN \
+ --table-order TARGET,SOURCE,TYPE,VFS-OPTS \
+ --use-spaces 2\
+ --output-width 110 \
+ >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_finalize_subtest
+
ts_init_subtest "empty-column"
printf ':a:b\n' | $TS_CMD_COLUMN --table --separator ':' --output-separator ':' >> $TS_OUTPUT 2>> $TS_ERRLOG
ts_finalize_subtest
projects / thirdparty / util-linux.git / commitdiff
