tests: add tests for new column features

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

diff --git a/tests/expected/column/table-headers b/tests/expected/column/table-headers
new file mode 100644 (file)
index 0000000..cd8d643
--- /dev/null
+++ b/tests/expected/column/table-headers
@@ -0,0 +1,42 @@
+MAJMIN  TARGET                           VFS-OPTS                         PROP        TYPE             SOURCE                FS-OPTS
+0:17    /sys                             rw,nosuid,nodev,noexec,relatime  shared:6    sysfs            sysfs                 rw
+0:4     /proc                            rw,nosuid,nodev,noexec,relatime  shared:5    proc             proc                  rw
+0:6     /dev                             rw,nosuid                        shared:2    devtmpfs         devtmpfs              rw,size=8175740k,nr_inodes=2043935,mode=755
+0:18    /sys/kernel/security             rw,nosuid,nodev,noexec,relatime  shared:7    securityfs       securityfs            rw
+0:19    /dev/shm                         rw,nosuid,nodev                  shared:3    tmpfs            tmpfs                 rw
+0:20    /dev/pts                         rw,nosuid,noexec,relatime        shared:4    devpts           devpts                rw,gid=5,mode=620,ptmxmode=000
+0:21    /run                             rw,nosuid,nodev                  shared:23   tmpfs            tmpfs                 rw,mode=755
+0:22    /sys/fs/cgroup                   ro,nosuid,nodev,noexec           shared:8    tmpfs            tmpfs                 ro,mode=755
+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
+0:24    /sys/fs/pstore                   rw,nosuid,nodev,noexec,relatime  shared:20   pstore           pstore                rw
+0:25    /sys/firmware/efi/efivars        rw,nosuid,nodev,noexec,relatime  shared:21   efivarfs         efivarfs              rw
+0:26    /sys/fs/cgroup/blkio             rw,nosuid,nodev,noexec,relatime  shared:10   cgroup           cgroup                rw,blkio
+0:27    /sys/fs/cgroup/cpu,cpuacct       rw,nosuid,nodev,noexec,relatime  shared:11   cgroup           cgroup                rw,cpu,cpuacct
+0:28    /sys/fs/cgroup/devices           rw,nosuid,nodev,noexec,relatime  shared:12   cgroup           cgroup                rw,devices
+0:29    /sys/fs/cgroup/hugetlb           rw,nosuid,nodev,noexec,relatime  shared:13   cgroup           cgroup                rw,hugetlb
+0:30    /sys/fs/cgroup/pids              rw,nosuid,nodev,noexec,relatime  shared:14   cgroup           cgroup                rw,pids
+0:31    /sys/fs/cgroup/memory            rw,nosuid,nodev,noexec,relatime  shared:15   cgroup           cgroup                rw,memory
+0:32    /sys/fs/cgroup/cpuset            rw,nosuid,nodev,noexec,relatime  shared:16   cgroup           cgroup                rw,cpuset
+0:33    /sys/fs/cgroup/perf_event        rw,nosuid,nodev,noexec,relatime  shared:17   cgroup           cgroup                rw,perf_event
+0:34    /sys/fs/cgroup/net_cls,net_prio  rw,nosuid,nodev,noexec,relatime  shared:18   cgroup           cgroup                rw,net_cls,net_prio
+0:35    /sys/fs/cgroup/freezer           rw,nosuid,nodev,noexec,relatime  shared:19   cgroup           cgroup                rw,freezer
+0:36    /sys/kernel/config               rw,relatime                      shared:22   configfs         configfs              rw
+8:4     /                                rw,relatime                      shared:1    ext4             /dev/sda4             rw,data=ordered
+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
+0:7     /sys/kernel/debug                rw,relatime                      shared:25   debugfs          debugfs               rw
+0:38    /dev/hugepages                   rw,relatime                      shared:26   hugetlbfs        hugetlbfs             rw
+0:16    /dev/mqueue                      rw,relatime                      shared:27   mqueue           mqueue                rw
+0:39    /proc/sys/fs/binfmt_misc         rw,relatime                      shared:28   binfmt_misc      binfmt_misc           rw
+0:40    /proc/fs/nfsd                    rw,relatime                      shared:29   nfsd             nfsd                  rw
+0:41    /tmp                             rw,nosuid,nodev                  shared:30   tmpfs            tmpfs                 rw
+8:3     /home                            rw,relatime                      shared:31   ext4             /dev/sda3             rw,data=ordered
+8:2     /boot                            rw,relatime                      shared:32   ext4             /dev/sda2             rw,data=ordered
+8:5     /home/games                      rw,relatime                      shared:33   ext4             /dev/sda5             rw,data=ordered
+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
+8:17    /home/archive                    rw,relatime                      shared:35   ext4             /dev/sdb1             rw,data=ordered
+0:43    /var/lib/nfs/rpc_pipefs          rw,relatime                      shared:36   rpc_pipefs       sunrpc                rw
+0:47    /sys/fs/fuse/connections         rw,relatime                      shared:163  fusectl          fusectl               rw
+0:46    /run/user/1000                   rw,nosuid,nodev,relatime         shared:158  tmpfs            tmpfs                 rw,size=1637324k,mode=700,uid=1000,gid=1000
+0:45    /run/user/1000/gvfs              rw,nosuid,nodev,relatime         shared:153  fuse.gvfsd-fuse  gvfsd-fuse            rw,user_id=1000,group_id=1000
+0:44    /run/user/0                      rw,nosuid,nodev,relatime         shared:114  tmpfs            tmpfs                 rw,size=1637324k,mode=700
+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

diff --git a/tests/expected/column/table-hide b/tests/expected/column/table-hide
new file mode 100644 (file)
index 0000000..3276f94
--- /dev/null
+++ b/tests/expected/column/table-hide
@@ -0,0 +1,41 @@
+/sys                             rw,nosuid,nodev,noexec,relatime  sysfs            sysfs                 rw
+/proc                            rw,nosuid,nodev,noexec,relatime  proc             proc                  rw
+/dev                             rw,nosuid                        devtmpfs         devtmpfs              rw,size=8175740k,nr_inodes=2043935,mode=755
+/sys/kernel/security             rw,nosuid,nodev,noexec,relatime  securityfs       securityfs            rw
+/dev/shm                         rw,nosuid,nodev                  tmpfs            tmpfs                 rw
+/dev/pts                         rw,nosuid,noexec,relatime        devpts           devpts                rw,gid=5,mode=620,ptmxmode=000
+/run                             rw,nosuid,nodev                  tmpfs            tmpfs                 rw,mode=755
+/sys/fs/cgroup                   ro,nosuid,nodev,noexec           tmpfs            tmpfs                 ro,mode=755
+/sys/fs/cgroup/systemd           rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
+/sys/fs/pstore                   rw,nosuid,nodev,noexec,relatime  pstore           pstore                rw
+/sys/firmware/efi/efivars        rw,nosuid,nodev,noexec,relatime  efivarfs         efivarfs              rw
+/sys/fs/cgroup/blkio             rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,blkio
+/sys/fs/cgroup/cpu,cpuacct       rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,cpu,cpuacct
+/sys/fs/cgroup/devices           rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,devices
+/sys/fs/cgroup/hugetlb           rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,hugetlb
+/sys/fs/cgroup/pids              rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,pids
+/sys/fs/cgroup/memory            rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,memory
+/sys/fs/cgroup/cpuset            rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,cpuset
+/sys/fs/cgroup/perf_event        rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,perf_event
+/sys/fs/cgroup/net_cls,net_prio  rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,net_cls,net_prio
+/sys/fs/cgroup/freezer           rw,nosuid,nodev,noexec,relatime  cgroup           cgroup                rw,freezer
+/sys/kernel/config               rw,relatime                      configfs         configfs              rw
+/                                rw,relatime                      ext4             /dev/sda4             rw,data=ordered
+/proc/sys/fs/binfmt_misc         rw,relatime                      autofs           systemd-1             rw,fd=37,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=12781
+/sys/kernel/debug                rw,relatime                      debugfs          debugfs               rw
+/dev/hugepages                   rw,relatime                      hugetlbfs        hugetlbfs             rw
+/dev/mqueue                      rw,relatime                      mqueue           mqueue                rw
+/proc/sys/fs/binfmt_misc         rw,relatime                      binfmt_misc      binfmt_misc           rw
+/proc/fs/nfsd                    rw,relatime                      nfsd             nfsd                  rw
+/tmp                             rw,nosuid,nodev                  tmpfs            tmpfs                 rw
+/home                            rw,relatime                      ext4             /dev/sda3             rw,data=ordered
+/boot                            rw,relatime                      ext4             /dev/sda2             rw,data=ordered
+/home/games                      rw,relatime                      ext4             /dev/sda5             rw,data=ordered
+/boot/efi                        rw,relatime                      vfat             /dev/sda1             rw,fmask=0077,dmask=0077,codepage=437,iocharset=ascii,shortname=winnt,errors=remount-ro
+/home/archive                    rw,relatime                      ext4             /dev/sdb1             rw,data=ordered
+/var/lib/nfs/rpc_pipefs          rw,relatime                      rpc_pipefs       sunrpc                rw
+/sys/fs/fuse/connections         rw,relatime                      fusectl          fusectl               rw
+/run/user/1000                   rw,nosuid,nodev,relatime         tmpfs            tmpfs                 rw,size=1637324k,mode=700,uid=1000,gid=1000
+/run/user/1000/gvfs              rw,nosuid,nodev,relatime         fuse.gvfsd-fuse  gvfsd-fuse            rw,user_id=1000,group_id=1000
+/run/user/0                      rw,nosuid,nodev,relatime         tmpfs            tmpfs                 rw,size=1637324k,mode=700
+/mnt/sounds                      rw,relatime                      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

diff --git a/tests/expected/column/table-long b/tests/expected/column/table-long
new file mode 100644 (file)
index 0000000..0752367
--- /dev/null
+++ b/tests/expected/column/table-long
@@ -0,0 +1,41 @@
+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

diff --git a/tests/expected/column/table-order b/tests/expected/column/table-order
new file mode 100644 (file)
index 0000000..432d3c9
--- /dev/null
+++ b/tests/expected/column/table-order
@@ -0,0 +1,42 @@
+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

diff --git a/tests/expected/column/table-right b/tests/expected/column/table-right
new file mode 100644 (file)
index 0000000..7bb0124
--- /dev/null
+++ b/tests/expected/column/table-right
@@ -0,0 +1,42 @@
+MAJMIN  TARGET                                      TYPE                SOURCE
+0:17    /sys                                       sysfs                 sysfs
+0:4     /proc                                       proc                  proc
+0:6     /dev                                    devtmpfs              devtmpfs
+0:18    /sys/kernel/security                  securityfs            securityfs
+0:19    /dev/shm                                   tmpfs                 tmpfs
+0:20    /dev/pts                                  devpts                devpts
+0:21    /run                                       tmpfs                 tmpfs
+0:22    /sys/fs/cgroup                             tmpfs                 tmpfs
+0:23    /sys/fs/cgroup/systemd                    cgroup                cgroup
+0:24    /sys/fs/pstore                            pstore                pstore
+0:25    /sys/firmware/efi/efivars               efivarfs              efivarfs
+0:26    /sys/fs/cgroup/blkio                      cgroup                cgroup
+0:27    /sys/fs/cgroup/cpu,cpuacct                cgroup                cgroup
+0:28    /sys/fs/cgroup/devices                    cgroup                cgroup
+0:29    /sys/fs/cgroup/hugetlb                    cgroup                cgroup
+0:30    /sys/fs/cgroup/pids                       cgroup                cgroup
+0:31    /sys/fs/cgroup/memory                     cgroup                cgroup
+0:32    /sys/fs/cgroup/cpuset                     cgroup                cgroup
+0:33    /sys/fs/cgroup/perf_event                 cgroup                cgroup
+0:34    /sys/fs/cgroup/net_cls,net_prio           cgroup                cgroup
+0:35    /sys/fs/cgroup/freezer                    cgroup                cgroup
+0:36    /sys/kernel/config                      configfs              configfs
+8:4     /                                           ext4             /dev/sda4
+0:37    /proc/sys/fs/binfmt_misc                  autofs             systemd-1
+0:7     /sys/kernel/debug                        debugfs               debugfs
+0:38    /dev/hugepages                         hugetlbfs             hugetlbfs
+0:16    /dev/mqueue                               mqueue                mqueue
+0:39    /proc/sys/fs/binfmt_misc             binfmt_misc           binfmt_misc
+0:40    /proc/fs/nfsd                               nfsd                  nfsd
+0:41    /tmp                                       tmpfs                 tmpfs
+8:3     /home                                       ext4             /dev/sda3
+8:2     /boot                                       ext4             /dev/sda2
+8:5     /home/games                                 ext4             /dev/sda5
+8:1     /boot/efi                                   vfat             /dev/sda1
+8:17    /home/archive                               ext4             /dev/sdb1
+0:43    /var/lib/nfs/rpc_pipefs               rpc_pipefs                sunrpc
+0:47    /sys/fs/fuse/connections                 fusectl               fusectl
+0:46    /run/user/1000                             tmpfs                 tmpfs
+0:45    /run/user/1000/gvfs              fuse.gvfsd-fuse            gvfsd-fuse
+0:44    /run/user/0                                tmpfs                 tmpfs
+0:48    /mnt/sounds                                 cifs  //sr.net.home/sounds

diff --git a/tests/expected/column/table-tree b/tests/expected/column/table-tree
new file mode 100644 (file)
index 0000000..1f1110b
--- /dev/null
+++ b/tests/expected/column/table-tree
@@ -0,0 +1,42 @@
+TARGET                                 SOURCE                TYPE             VFS-OPTS
+/                                      /dev/sda4             ext4             rw,relatime
+|-/sys                                 sysfs                 sysfs            rw,nosuid,nodev,noexec,relatime
+| |-/sys/kernel/security               securityfs            securityfs       rw,nosuid,nodev,noexec,relatime
+| |-/sys/fs/cgroup                     tmpfs                 tmpfs            ro,nosuid,nodev,noexec
+| | |-/sys/fs/cgroup/systemd           cgroup                cgroup           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/fs/pstore                     pstore                pstore           rw,nosuid,nodev,noexec,relatime
+| |-/sys/firmware/efi/efivars          efivarfs              efivarfs         rw,nosuid,nodev,noexec,relatime
+| |-/sys/kernel/config                 configfs              configfs         rw,relatime
+| |-/sys/kernel/debug                  debugfs               debugfs          rw,relatime
+| `-/sys/fs/fuse/connections           fusectl               fusectl          rw,relatime
+|-/proc                                proc                  proc             rw,nosuid,nodev,noexec,relatime
+| |-/proc/sys/fs/binfmt_misc           systemd-1             autofs           rw,relatime
+| | `-/proc/sys/fs/binfmt_misc         binfmt_misc           binfmt_misc      rw,relatime
+| `-/proc/fs/nfsd                      nfsd                  nfsd             rw,relatime
+|-/dev                                 devtmpfs              devtmpfs         rw,nosuid
+| |-/dev/shm                           tmpfs                 tmpfs            rw,nosuid,nodev
+| |-/dev/pts                           devpts                devpts           rw,nosuid,noexec,relatime
+| |-/dev/hugepages                     hugetlbfs             hugetlbfs        rw,relatime
+| `-/dev/mqueue                        mqueue                mqueue           rw,relatime
+|-/run                                 tmpfs                 tmpfs            rw,nosuid,nodev
+| |-/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
+|-/tmp                                 tmpfs                 tmpfs            rw,nosuid,nodev
+|-/home                                /dev/sda3             ext4             rw,relatime
+| |-/home/games                        /dev/sda5             ext4             rw,relatime
+| `-/home/archive                      /dev/sdb1             ext4             rw,relatime
+|-/boot                                /dev/sda2             ext4             rw,relatime
+| `-/boot/efi                          /dev/sda1             vfat             rw,relatime
+|-/var/lib/nfs/rpc_pipefs              sunrpc                rpc_pipefs       rw,relatime
+`-/mnt/sounds                          //sr.net.home/sounds  cifs             rw,relatime

diff --git a/tests/expected/column/table-truncate b/tests/expected/column/table-truncate
new file mode 100644 (file)
index 0000000..6741dcb
--- /dev/null
+++ b/tests/expected/column/table-truncate
@@ -0,0 +1,42 @@
+MAJMIN  TARGET                           VFS-OPTS  PROP        TYPE             SOURCE                FS-OPTS
+0:17    /sys                             rw,nosui  shared:6    sysfs            sysfs                 rw
+0:4     /proc                            rw,nosui  shared:5    proc             proc                  rw
+0:6     /dev                             rw,nosui  shared:2    devtmpfs         devtmpfs              rw,size
+0:18    /sys/kernel/security             rw,nosui  shared:7    securityfs       securityfs            rw
+0:19    /dev/shm                         rw,nosui  shared:3    tmpfs            tmpfs                 rw
+0:20    /dev/pts                         rw,nosui  shared:4    devpts           devpts                rw,gid=
+0:21    /run                             rw,nosui  shared:23   tmpfs            tmpfs                 rw,mode
+0:22    /sys/fs/cgroup                   ro,nosui  shared:8    tmpfs            tmpfs                 ro,mode
+0:23    /sys/fs/cgroup/systemd           rw,nosui  shared:9    cgroup           cgroup                rw,xatt
+0:24    /sys/fs/pstore                   rw,nosui  shared:20   pstore           pstore                rw
+0:25    /sys/firmware/efi/efivars        rw,nosui  shared:21   efivarfs         efivarfs              rw
+0:26    /sys/fs/cgroup/blkio             rw,nosui  shared:10   cgroup           cgroup                rw,blki
+0:27    /sys/fs/cgroup/cpu,cpuacct       rw,nosui  shared:11   cgroup           cgroup                rw,cpu,
+0:28    /sys/fs/cgroup/devices           rw,nosui  shared:12   cgroup           cgroup                rw,devi
+0:29    /sys/fs/cgroup/hugetlb           rw,nosui  shared:13   cgroup           cgroup                rw,huge
+0:30    /sys/fs/cgroup/pids              rw,nosui  shared:14   cgroup           cgroup                rw,pids
+0:31    /sys/fs/cgroup/memory            rw,nosui  shared:15   cgroup           cgroup                rw,memo
+0:32    /sys/fs/cgroup/cpuset            rw,nosui  shared:16   cgroup           cgroup                rw,cpus
+0:33    /sys/fs/cgroup/perf_event        rw,nosui  shared:17   cgroup           cgroup                rw,perf
+0:34    /sys/fs/cgroup/net_cls,net_prio  rw,nosui  shared:18   cgroup           cgroup                rw,net_
+0:35    /sys/fs/cgroup/freezer           rw,nosui  shared:19   cgroup           cgroup                rw,free
+0:36    /sys/kernel/config               rw,relat  shared:22   configfs         configfs              rw
+8:4     /                                rw,relat  shared:1    ext4             /dev/sda4             rw,data
+0:37    /proc/sys/fs/binfmt_misc         rw,relat  shared:24   autofs           systemd-1             rw,fd=3
+0:7     /sys/kernel/debug                rw,relat  shared:25   debugfs          debugfs               rw
+0:38    /dev/hugepages                   rw,relat  shared:26   hugetlbfs        hugetlbfs             rw
+0:16    /dev/mqueue                      rw,relat  shared:27   mqueue           mqueue                rw
+0:39    /proc/sys/fs/binfmt_misc         rw,relat  shared:28   binfmt_misc      binfmt_misc           rw
+0:40    /proc/fs/nfsd                    rw,relat  shared:29   nfsd             nfsd                  rw
+0:41    /tmp                             rw,nosui  shared:30   tmpfs            tmpfs                 rw
+8:3     /home                            rw,relat  shared:31   ext4             /dev/sda3             rw,data
+8:2     /boot                            rw,relat  shared:32   ext4             /dev/sda2             rw,data
+8:5     /home/games                      rw,relat  shared:33   ext4             /dev/sda5             rw,data
+8:1     /boot/efi                        rw,relat  shared:34   vfat             /dev/sda1             rw,fmas
+8:17    /home/archive                    rw,relat  shared:35   ext4             /dev/sdb1             rw,data
+0:43    /var/lib/nfs/rpc_pipefs          rw,relat  shared:36   rpc_pipefs       sunrpc                rw
+0:47    /sys/fs/fuse/connections         rw,relat  shared:163  fusectl          fusectl               rw
+0:46    /run/user/1000                   rw,nosui  shared:158  tmpfs            tmpfs                 rw,size
+0:45    /run/user/1000/gvfs              rw,nosui  shared:153  fuse.gvfsd-fuse  gvfsd-fuse            rw,user
+0:44    /run/user/0                      rw,nosui  shared:114  tmpfs            tmpfs                 rw,size
+0:48    /mnt/sounds                      rw,relat  shared:119  cifs             //sr.net.home/sounds  rw,vers

diff --git a/tests/expected/column/table-wrap b/tests/expected/column/table-wrap
new file mode 100644 (file)
index 0000000..47585dd
--- /dev/null
+++ b/tests/expected/column/table-wrap
@@ -0,0 +1,56 @@
+MAJMIN  TARGET                           TYPE             SOURCE                FS-OPTS
+0:17    /sys                             sysfs            sysfs                 rw
+0:4     /proc                            proc             proc                  rw
+0:6     /dev                             devtmpfs         devtmpfs              rw,size=8175740k,nr_inodes=204
+                                                                                3935,mode=755
+0:18    /sys/kernel/security             securityfs       securityfs            rw
+0:19    /dev/shm                         tmpfs            tmpfs                 rw
+0:20    /dev/pts                         devpts           devpts                rw,gid=5,mode=620,ptmxmode=000
+0:21    /run                             tmpfs            tmpfs                 rw,mode=755
+0:22    /sys/fs/cgroup                   tmpfs            tmpfs                 ro,mode=755
+0:23    /sys/fs/cgroup/systemd           cgroup           cgroup                rw,xattr,release_agent=/usr/li
+                                                                                b/systemd/systemd-cgroups-agen
+                                                                                t,name=systemd
+0:24    /sys/fs/pstore                   pstore           pstore                rw
+0:25    /sys/firmware/efi/efivars        efivarfs         efivarfs              rw
+0:26    /sys/fs/cgroup/blkio             cgroup           cgroup                rw,blkio
+0:27    /sys/fs/cgroup/cpu,cpuacct       cgroup           cgroup                rw,cpu,cpuacct
+0:28    /sys/fs/cgroup/devices           cgroup           cgroup                rw,devices
+0:29    /sys/fs/cgroup/hugetlb           cgroup           cgroup                rw,hugetlb
+0:30    /sys/fs/cgroup/pids              cgroup           cgroup                rw,pids
+0:31    /sys/fs/cgroup/memory            cgroup           cgroup                rw,memory
+0:32    /sys/fs/cgroup/cpuset            cgroup           cgroup                rw,cpuset
+0:33    /sys/fs/cgroup/perf_event        cgroup           cgroup                rw,perf_event
+0:34    /sys/fs/cgroup/net_cls,net_prio  cgroup           cgroup                rw,net_cls,net_prio
+0:35    /sys/fs/cgroup/freezer           cgroup           cgroup                rw,freezer
+0:36    /sys/kernel/config               configfs         configfs              rw
+8:4     /                                ext4             /dev/sda4             rw,data=ordered
+0:37    /proc/sys/fs/binfmt_misc         autofs           systemd-1             rw,fd=37,pgrp=1,timeout=0,minp
+                                                                                roto=5,maxproto=5,direct,pipe_
+                                                                                ino=12781
+0:7     /sys/kernel/debug                debugfs          debugfs               rw
+0:38    /dev/hugepages                   hugetlbfs        hugetlbfs             rw
+0:16    /dev/mqueue                      mqueue           mqueue                rw
+0:39    /proc/sys/fs/binfmt_misc         binfmt_misc      binfmt_misc           rw
+0:40    /proc/fs/nfsd                    nfsd             nfsd                  rw
+0:41    /tmp                             tmpfs            tmpfs                 rw
+8:3     /home                            ext4             /dev/sda3             rw,data=ordered
+8:2     /boot                            ext4             /dev/sda2             rw,data=ordered
+8:5     /home/games                      ext4             /dev/sda5             rw,data=ordered
+8:1     /boot/efi                        vfat             /dev/sda1             rw,fmask=0077,dmask=0077,codep
+                                                                                age=437,iocharset=ascii,shortn
+                                                                                ame=winnt,errors=remount-ro
+8:17    /home/archive                    ext4             /dev/sdb1             rw,data=ordered
+0:43    /var/lib/nfs/rpc_pipefs          rpc_pipefs       sunrpc                rw
+0:47    /sys/fs/fuse/connections         fusectl          fusectl               rw
+0:46    /run/user/1000                   tmpfs            tmpfs                 rw,size=1637324k,mode=700,uid=
+                                                                                1000,gid=1000
+0:45    /run/user/1000/gvfs              fuse.gvfsd-fuse  gvfsd-fuse            rw,user_id=1000,group_id=1000
+0:44    /run/user/0                      tmpfs            tmpfs                 rw,size=1637324k,mode=700
+0:48    /mnt/sounds                      cifs             //sr.net.home/sounds  rw,vers=1.0,cache=strict,usern
+                                                                                ame=kzak,domain=SRGROUP,uid=0,
+                                                                                noforceuid,gid=0,noforcegid,ad
+                                                                                dr=192.168.111.1,unix,posixpat
+                                                                                hs,serverino,mapposix,acl,rsiz
+                                                                                e=1048576,wsize=65536,echo_int
+                                                                                erval=60,actimeo=1

diff --git a/tests/ts/column/files/mountinfo b/tests/ts/column/files/mountinfo
new file mode 100644 (file)
index 0000000..b751e16
--- /dev/null
+++ b/tests/ts/column/files/mountinfo
@@ -0,0 +1,41 @@
+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

diff --git a/tests/ts/column/table b/tests/ts/column/table
index c977b96e20f7537466169a93883b504c8530ebb4..f11c1d79409520fc6c3dcc1c9907f1b43f878830 100755 (executable)
--- a/tests/ts/column/table
+++ b/tests/ts/column/table
@@ -36,4 +36,69 @@ ts_init_subtest "input-separator"
 $TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>&1
 ts_finalize_subtest
 
+
+ts_init_subtest "long"
+$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "hide"
+$TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
+               --table-hide 1,2,3,4,7,8  >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "headers"
+$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 \
+               >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "truncate"
+$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 \
+               --table-truncate VFS-OPTS,FS-OPTS \
+               --output-width 80 \
+               >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "right"
+$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,VFS-OPTS,FS-OPTS,PROP \
+               --table-right SOURCE,TYPE \
+               --output-width 80 \
+               >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "wrap"
+$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,VFS-OPTS,PROP \
+               --table-wrap FS-OPTS \
+               --output-width 110 \
+               >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "order"
+$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 \
+               --output-width 110 \
+               >> $TS_OUTPUT 2>&1
+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 \
+               --table-hide=SEP,ID,PARENT,ROOT,PROP,FS-OPTS,MAJMIN \
+               --table-order TARGET,SOURCE,TYPE,VFS-OPTS \
+               --tree TARGET \
+               --tree-id ID \
+               --tree-parent PARENT \
+               --output-width 110 \
+               >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
 ts_finalize