tests: (findmnt) add more tests

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/expected/findmnt/outputs-all b/tests/expected/findmnt/outputs-all
new file mode 100644 (file)
index 0000000..2194368
--- /dev/null
+++ b/tests/expected/findmnt/outputs-all
@@ -0,0 +1,33 @@
+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

diff --git a/tests/expected/findmnt/outputs-ascii b/tests/expected/findmnt/outputs-ascii
new file mode 100644 (file)
index 0000000..e7c70dc
--- /dev/null
+++ b/tests/expected/findmnt/outputs-ascii
@@ -0,0 +1,33 @@
+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

diff --git a/tests/expected/findmnt/outputs-bytes b/tests/expected/findmnt/outputs-bytes
new file mode 100644 (file)
index 0000000..04bd089
--- /dev/null
+++ b/tests/expected/findmnt/outputs-bytes
@@ -0,0 +1,2 @@
+<bytes>
+<bytes>

diff --git a/tests/expected/findmnt/outputs-canonicalization b/tests/expected/findmnt/outputs-canonicalization
new file mode 100644 (file)
index 0000000..03f7d99
--- /dev/null
+++ b/tests/expected/findmnt/outputs-canonicalization
@@ -0,0 +1,2 @@
+TARGET
+/

diff --git a/tests/expected/findmnt/outputs-direction-backward b/tests/expected/findmnt/outputs-direction-backward
new file mode 100644 (file)
index 0000000..16c638d
--- /dev/null
+++ b/tests/expected/findmnt/outputs-direction-backward
@@ -0,0 +1,2 @@
+TARGET               SOURCE FSTYPE OPTIONS
+/sys/fs/cgroup/blkio cgroup cgroup rw,nosuid,nodev,noexec,relatime,blkio

diff --git a/tests/expected/findmnt/outputs-direction-forward b/tests/expected/findmnt/outputs-direction-forward
new file mode 100644 (file)
index 0000000..22da6a2
--- /dev/null
+++ b/tests/expected/findmnt/outputs-direction-forward
@@ -0,0 +1,2 @@
+TARGET                 SOURCE FSTYPE OPTIONS
+/sys/fs/cgroup/systemd cgroup cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd

diff --git a/tests/expected/findmnt/outputs-hyperlink b/tests/expected/findmnt/outputs-hyperlink
new file mode 100644 (file)
index 0000000..187e3e3
--- /dev/null
+++ b/tests/expected/findmnt/outputs-hyperlink
@@ -0,0 +1 @@
+033]8;;

diff --git a/tests/expected/findmnt/outputs-id b/tests/expected/findmnt/outputs-id
new file mode 100644 (file)
index 0000000..ddc7c06
--- /dev/null
+++ b/tests/expected/findmnt/outputs-id
@@ -0,0 +1,2 @@
+TARGET SOURCE FSTYPE OPTIONS
+/proc  /proc  proc   rw,relatime

diff --git a/tests/expected/findmnt/outputs-invert-pseudo b/tests/expected/findmnt/outputs-invert-pseudo
new file mode 100644 (file)
index 0000000..08e23ec
--- /dev/null
+++ b/tests/expected/findmnt/outputs-invert-pseudo
@@ -0,0 +1,6 @@
+TARGET          SOURCE                FSTYPE OPTIONS
+/               /dev/sda4             ext3   rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
+|-/proc/bus/usb /proc/bus/usb         usbfs  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
+`-/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

diff --git a/tests/expected/findmnt/outputs-json b/tests/expected/findmnt/outputs-json
new file mode 100644 (file)
index 0000000..56c31c6
--- /dev/null
+++ b/tests/expected/findmnt/outputs-json
@@ -0,0 +1,192 @@
+{
+   "filesystems": [
+      {
+         "target": "/",
+         "source": "/dev/sda4",
+         "fstype": "ext3",
+         "options": "rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered",
+         "children": [
+            {
+               "target": "/proc",
+               "source": "/proc",
+               "fstype": "proc",
+               "options": "rw,relatime",
+               "children": [
+                  {
+                     "target": "/proc/sys/fs/binfmt_misc",
+                     "source": "systemd-1",
+                     "fstype": "autofs",
+                     "options": "rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct",
+                     "children": [
+                        {
+                           "target": "/proc/sys/fs/binfmt_misc",
+                           "source": "none",
+                           "fstype": "binfmt_misc",
+                           "options": "rw,relatime"
+                        }
+                     ]
+                  },{
+                     "target": "/proc/bus/usb",
+                     "source": "/proc/bus/usb",
+                     "fstype": "usbfs",
+                     "options": "rw,relatime"
+                  }
+               ]
+            },{
+               "target": "/sys",
+               "source": "/sys",
+               "fstype": "sysfs",
+               "options": "rw,relatime",
+               "children": [
+                  {
+                     "target": "/sys/fs/cgroup",
+                     "source": "tmpfs",
+                     "fstype": "tmpfs",
+                     "options": "rw,nosuid,nodev,noexec,relatime,mode=755",
+                     "children": [
+                        {
+                           "target": "/sys/fs/cgroup/systemd",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd"
+                        },{
+                           "target": "/sys/fs/cgroup/cpuset",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,cpuset"
+                        },{
+                           "target": "/sys/fs/cgroup/ns",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,ns"
+                        },{
+                           "target": "/sys/fs/cgroup/cpu",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,cpu"
+                        },{
+                           "target": "/sys/fs/cgroup/cpuacct",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,cpuacct"
+                        },{
+                           "target": "/sys/fs/cgroup/memory",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,memory"
+                        },{
+                           "target": "/sys/fs/cgroup/devices",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,devices"
+                        },{
+                           "target": "/sys/fs/cgroup/freezer",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,freezer"
+                        },{
+                           "target": "/sys/fs/cgroup/net_cls",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,net_cls"
+                        },{
+                           "target": "/sys/fs/cgroup/blkio",
+                           "source": "cgroup",
+                           "fstype": "cgroup",
+                           "options": "rw,nosuid,nodev,noexec,relatime,blkio"
+                        }
+                     ]
+                  },{
+                     "target": "/sys/kernel/security",
+                     "source": "systemd-1",
+                     "fstype": "autofs",
+                     "options": "rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct"
+                  },{
+                     "target": "/sys/kernel/debug",
+                     "source": "systemd-1",
+                     "fstype": "autofs",
+                     "options": "rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct"
+                  },{
+                     "target": "/sys/fs/fuse/connections",
+                     "source": "fusectl",
+                     "fstype": "fusectl",
+                     "options": "rw,relatime"
+                  }
+               ]
+            },{
+               "target": "/dev",
+               "source": "udev",
+               "fstype": "devtmpfs",
+               "options": "rw,relatime,size=1983516k,nr_inodes=495879,mode=755",
+               "children": [
+                  {
+                     "target": "/dev/pts",
+                     "source": "devpts",
+                     "fstype": "devpts",
+                     "options": "rw,relatime,gid=5,mode=620,ptmxmode=000"
+                  },{
+                     "target": "/dev/shm",
+                     "source": "tmpfs",
+                     "fstype": "tmpfs",
+                     "options": "rw,relatime"
+                  },{
+                     "target": "/dev/hugepages",
+                     "source": "systemd-1",
+                     "fstype": "autofs",
+                     "options": "rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct",
+                     "children": [
+                        {
+                           "target": "/dev/hugepages",
+                           "source": "hugetlbfs",
+                           "fstype": "hugetlbfs",
+                           "options": "rw,relatime"
+                        }
+                     ]
+                  },{
+                     "target": "/dev/mqueue",
+                     "source": "systemd-1",
+                     "fstype": "autofs",
+                     "options": "rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct",
+                     "children": [
+                        {
+                           "target": "/dev/mqueue",
+                           "source": "mqueue",
+                           "fstype": "mqueue",
+                           "options": "rw,relatime"
+                        }
+                     ]
+                  }
+               ]
+            },{
+               "target": "/boot",
+               "source": "/dev/sda6",
+               "fstype": "ext3",
+               "options": "rw,noatime,errors=continue,barrier=0,data=ordered"
+            },{
+               "target": "/home/kzak",
+               "source": "/dev/mapper/kzak-home",
+               "fstype": "ext4",
+               "options": "rw,noatime,barrier=1,data=ordered",
+               "children": [
+                  {
+                     "target": "/home/kzak/.gvfs",
+                     "source": "gvfs-fuse-daemon",
+                     "fstype": "fuse.gvfs-fuse-daemon",
+                     "options": "rw,nosuid,nodev,relatime,user_id=500,group_id=500"
+                  }
+               ]
+            },{
+               "target": "/var/lib/nfs/rpc_pipefs",
+               "source": "sunrpc",
+               "fstype": "rpc_pipefs",
+               "options": "rw,relatime"
+            },{
+               "target": "/mnt/sounds",
+               "source": "//foo.home/bar/",
+               "fstype": "cifs",
+               "options": "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"
+            }
+         ]
+      }
+   ]
+}

diff --git a/tests/expected/findmnt/outputs-list b/tests/expected/findmnt/outputs-list
new file mode 100644 (file)
index 0000000..a94e6d6
--- /dev/null
+++ b/tests/expected/findmnt/outputs-list
@@ -0,0 +1,33 @@
+TARGET                   SOURCE                FSTYPE                OPTIONS
+/proc                    /proc                 proc                  rw,relatime
+/sys                     /sys                  sysfs                 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/sda4             ext3                  rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
+/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
+/dev/hugepages           systemd-1             autofs                rw,relatime,fd=23,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
+/proc/sys/fs/binfmt_misc systemd-1             autofs                rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+/dev/mqueue              systemd-1             autofs                rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+/proc/bus/usb            /proc/bus/usb         usbfs                 rw,relatime
+/dev/hugepages           hugetlbfs             hugetlbfs             rw,relatime
+/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
+/proc/sys/fs/binfmt_misc none                  binfmt_misc           rw,relatime
+/sys/fs/fuse/connections fusectl               fusectl               rw,relatime
+/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

diff --git a/tests/expected/findmnt/outputs-list-columns b/tests/expected/findmnt/outputs-list-columns
new file mode 100644 (file)
index 0000000..211d502
--- /dev/null
+++ b/tests/expected/findmnt/outputs-list-columns
@@ -0,0 +1,32 @@
+     TARGET <string>        mountpoint
+     ACTION <string>        action detected by --poll
+      AVAIL <string|number> filesystem size available, use <number> if --bytes is given
+       FREQ <integer>       dump(8) period in days [fstab only]
+     FSROOT <string>        filesystem root
+     FSTYPE <string>        filesystem type
+ FS-OPTIONS <string>        FS specific mount options
+         ID <integer>       mount ID
+  INO.AVAIL <string>        number of available inodes
+  INO.TOTAL <string>        total number of inodes
+   INO.USED <string>        number of used inodes
+   INO.USE% <string>        percentage of INO.USED divided by INO.TOTAL
+      LABEL <string>        filesystem label
+    MAJ:MIN <string>        major:minor device number
+OLD-OPTIONS <string>        old mount options saved by --poll
+ OLD-TARGET <string>        old mountpoint saved by --poll
+    OPTIONS <string>        all mount options
+ OPT-FIELDS <string>        optional mount fields
+     PARENT <integer>       mount parent ID
+  PARTLABEL <string>        partition label
+   PARTUUID <string>        partition UUID
+     PASSNO <integer>       pass number on parallel fsck(8) [fstab only]
+PROPAGATION <string>        VFS propagation flags
+       SIZE <string|number> filesystem size, use <number> if --bytes is given
+     SOURCE <string>        source device
+    SOURCES <string>        all possible source devices
+        TID <integer>       task ID
+    UNIQ-ID <integer>       mount 64-bit ID (requires --kernel=listmount)
+       USED <string|number> filesystem size used, use <number> if --bytes is given
+       USE% <string>        filesystem use percentage
+       UUID <string>        filesystem UUID
+VFS-OPTIONS <string>        VFS specific mount options

diff --git a/tests/expected/findmnt/outputs-nofsroot b/tests/expected/findmnt/outputs-nofsroot
new file mode 100644 (file)
index 0000000..74895ad
--- /dev/null
+++ b/tests/expected/findmnt/outputs-nofsroot
@@ -0,0 +1,30 @@
+TARGET                                SOURCE    FSTYPE    OPTIONS
+/                                     /dev/sda3 ext4      rw,relatime
+|-/sys                                sysfs     sysfs     ro,nosuid,nodev,noexec,relatime
+| `-/sys/fs/cgroup                    tmpfs     tmpfs     ro,nosuid,nodev,noexec,mode=755
+|   |-/sys/fs/cgroup/perf_event       cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,perf_event
+|   |-/sys/fs/cgroup/net_cls          cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,net_cls
+|   |-/sys/fs/cgroup/blkio            cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,blkio
+|   |-/sys/fs/cgroup/memory           cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,memory
+|   |-/sys/fs/cgroup/pids             cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,pids
+|   |-/sys/fs/cgroup/cpuset           cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,cpuset
+|   |-/sys/fs/cgroup/freezer          cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,freezer
+|   |-/sys/fs/cgroup/cpu,cpuacct      cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,cpu,cpuacct
+|   |-/sys/fs/cgroup/devices          cgroup    cgroup    ro,nosuid,nodev,noexec,relatime,devices
+|   `-/sys/fs/cgroup/systemd          cgroup    cgroup    rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
+|-/dev                                tmpfs     tmpfs     rw,nosuid,mode=755
+| |-/dev/mqueue                       mqueue    mqueue    rw,relatime
+| |-/dev/hugepages                    hugetlbfs hugetlbfs rw,relatime
+| |-/dev/shm                          tmpfs     tmpfs     rw,nosuid,nodev
+| |-/dev/pts                          devpts    devpts    rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=666
+| `-/dev/console                      devpts    devpts    rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000
+|-/run                                tmpfs     tmpfs     rw,nosuid,nodev,mode=755
+| |-/run/user/0                       tmpfs     tmpfs     rw,nosuid,nodev,relatime,size=1634120k,mode=700
+| `-/run/systemd/nspawn/incoming      run       tmpfs     ro,relatime,mode=755
+|-/tmp                                tmpfs     tmpfs     rw
+`-/proc                               proc      proc      rw,nosuid,nodev,noexec,relatime
+  |-/proc/sys/kernel/random/boot_id   tmpfs     tmpfs     rw,nosuid,nodev,mode=755
+  |-/proc/kmsg                        tmpfs     tmpfs     rw,nosuid,nodev,mode=755
+  |-/proc/sys                         proc      proc      ro,nosuid,nodev,noexec,relatime
+  | `-/proc/sys/kernel/random/boot_id tmpfs     tmpfs     ro,nosuid,nodev,mode=755
+  `-/proc/sysrq-trigger               proc      proc      ro,nosuid,nodev,noexec,relatime

diff --git a/tests/expected/findmnt/outputs-pairs b/tests/expected/findmnt/outputs-pairs
new file mode 100644 (file)
index 0000000..e8bec2c
--- /dev/null
+++ b/tests/expected/findmnt/outputs-pairs
@@ -0,0 +1,32 @@
+TARGET="/proc" SOURCE="/proc" FSTYPE="proc" OPTIONS="rw,relatime"
+TARGET="/sys" SOURCE="/sys" FSTYPE="sysfs" OPTIONS="rw,relatime"
+TARGET="/dev" SOURCE="udev" FSTYPE="devtmpfs" OPTIONS="rw,relatime,size=1983516k,nr_inodes=495879,mode=755"
+TARGET="/dev/pts" SOURCE="devpts" FSTYPE="devpts" OPTIONS="rw,relatime,gid=5,mode=620,ptmxmode=000"
+TARGET="/dev/shm" SOURCE="tmpfs" FSTYPE="tmpfs" OPTIONS="rw,relatime"
+TARGET="/" SOURCE="/dev/sda4" FSTYPE="ext3" OPTIONS="rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered"
+TARGET="/sys/fs/cgroup" SOURCE="tmpfs" FSTYPE="tmpfs" OPTIONS="rw,nosuid,nodev,noexec,relatime,mode=755"
+TARGET="/sys/fs/cgroup/systemd" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd"
+TARGET="/sys/fs/cgroup/cpuset" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,cpuset"
+TARGET="/sys/fs/cgroup/ns" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,ns"
+TARGET="/sys/fs/cgroup/cpu" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,cpu"
+TARGET="/sys/fs/cgroup/cpuacct" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,cpuacct"
+TARGET="/sys/fs/cgroup/memory" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,memory"
+TARGET="/sys/fs/cgroup/devices" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,devices"
+TARGET="/sys/fs/cgroup/freezer" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,freezer"
+TARGET="/sys/fs/cgroup/net_cls" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,net_cls"
+TARGET="/sys/fs/cgroup/blkio" SOURCE="cgroup" FSTYPE="cgroup" OPTIONS="rw,nosuid,nodev,noexec,relatime,blkio"
+TARGET="/sys/kernel/security" SOURCE="systemd-1" FSTYPE="autofs" OPTIONS="rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct"
+TARGET="/dev/hugepages" SOURCE="systemd-1" FSTYPE="autofs" OPTIONS="rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct"
+TARGET="/sys/kernel/debug" SOURCE="systemd-1" FSTYPE="autofs" OPTIONS="rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct"
+TARGET="/proc/sys/fs/binfmt_misc" SOURCE="systemd-1" FSTYPE="autofs" OPTIONS="rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct"
+TARGET="/dev/mqueue" SOURCE="systemd-1" FSTYPE="autofs" OPTIONS="rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct"
+TARGET="/proc/bus/usb" SOURCE="/proc/bus/usb" FSTYPE="usbfs" OPTIONS="rw,relatime"
+TARGET="/dev/hugepages" SOURCE="hugetlbfs" FSTYPE="hugetlbfs" OPTIONS="rw,relatime"
+TARGET="/dev/mqueue" SOURCE="mqueue" FSTYPE="mqueue" OPTIONS="rw,relatime"
+TARGET="/boot" SOURCE="/dev/sda6" FSTYPE="ext3" OPTIONS="rw,noatime,errors=continue,barrier=0,data=ordered"
+TARGET="/home/kzak" SOURCE="/dev/mapper/kzak-home" FSTYPE="ext4" OPTIONS="rw,noatime,barrier=1,data=ordered"
+TARGET="/proc/sys/fs/binfmt_misc" SOURCE="none" FSTYPE="binfmt_misc" OPTIONS="rw,relatime"
+TARGET="/sys/fs/fuse/connections" SOURCE="fusectl" FSTYPE="fusectl" OPTIONS="rw,relatime"
+TARGET="/home/kzak/.gvfs" SOURCE="gvfs-fuse-daemon" FSTYPE="fuse.gvfs-fuse-daemon" OPTIONS="rw,nosuid,nodev,relatime,user_id=500,group_id=500"
+TARGET="/var/lib/nfs/rpc_pipefs" SOURCE="sunrpc" FSTYPE="rpc_pipefs" OPTIONS="rw,relatime"
+TARGET="/mnt/sounds" SOURCE="//foo.home/bar/" FSTYPE="cifs" OPTIONS="rw,relatime,unc=\x5c\x5cfoo.home\x5cbar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344"

diff --git a/tests/expected/findmnt/outputs-pseudo b/tests/expected/findmnt/outputs-pseudo
new file mode 100644 (file)
index 0000000..53a77c5
--- /dev/null
+++ b/tests/expected/findmnt/outputs-pseudo
@@ -0,0 +1,28 @@
+TARGET                       SOURCE           FSTYPE                OPTIONS
+/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
+/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
+/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

diff --git a/tests/expected/findmnt/outputs-raw b/tests/expected/findmnt/outputs-raw
new file mode 100644 (file)
index 0000000..1386ffc
--- /dev/null
+++ b/tests/expected/findmnt/outputs-raw
@@ -0,0 +1,33 @@
+TARGET SOURCE FSTYPE OPTIONS
+/proc /proc proc rw,relatime
+/sys /sys sysfs 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/sda4 ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
+/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
+/dev/hugepages systemd-1 autofs rw,relatime,fd=23,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
+/proc/sys/fs/binfmt_misc systemd-1 autofs rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+/dev/mqueue systemd-1 autofs rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+/proc/bus/usb /proc/bus/usb usbfs rw,relatime
+/dev/hugepages hugetlbfs hugetlbfs rw,relatime
+/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
+/proc/sys/fs/binfmt_misc none binfmt_misc rw,relatime
+/sys/fs/fuse/connections fusectl fusectl rw,relatime
+/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=\x5c\x5cfoo.home\x5cbar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344

diff --git a/tests/expected/findmnt/outputs-real b/tests/expected/findmnt/outputs-real
new file mode 100644 (file)
index 0000000..08e23ec
--- /dev/null
+++ b/tests/expected/findmnt/outputs-real
@@ -0,0 +1,6 @@
+TARGET          SOURCE                FSTYPE OPTIONS
+/               /dev/sda4             ext3   rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
+|-/proc/bus/usb /proc/bus/usb         usbfs  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
+`-/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

diff --git a/tests/expected/findmnt/outputs-verify b/tests/expected/findmnt/outputs-verify
new file mode 100644 (file)
index 0000000..24f76ea
--- /dev/null
+++ b/tests/expected/findmnt/outputs-verify
@@ -0,0 +1,5 @@
+/
+   [ ] target exists
+   [W] source /dev/null is not a block device
+   [W] cannot detect on-disk filesystem type (Invalid argument)
+   [W] recommended root FS passno is 1 (current is 2)

diff --git a/tests/expected/findmnt/outputs-verify.err b/tests/expected/findmnt/outputs-verify.err
new file mode 100644 (file)
index 0000000..d2b5cc1
--- /dev/null
+++ b/tests/expected/findmnt/outputs-verify.err
@@ -0,0 +1,2 @@
+
+0 parse errors, 0 errors, 3 warnings

diff --git a/tests/ts/findmnt/outputs b/tests/ts/findmnt/outputs
index ab0b33ee4fade17df65c3edb79e9e0d453172606..e3181335c1dc4172e3e700d0d2d4eb088945c314 100755 (executable)
--- a/tests/ts/findmnt/outputs
+++ b/tests/ts/findmnt/outputs
@@ -19,7 +19,115 @@ TS_DESC="outputs"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_FINDMNT"
+ts_check_test_command "$TS_CMD_HEXDUMP"
 
+ts_init_subtest "all"
+LC_ALL=C.UTF-8 $TS_CMD_FINDMNT --all --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "list"
+$TS_CMD_FINDMNT --all --list --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "list-columns"
+$TS_CMD_FINDMNT --list-columns >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "raw"
+$TS_CMD_FINDMNT --raw --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "real"
+$TS_CMD_FINDMNT --real --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "pseudo"
+$TS_CMD_FINDMNT --pseudo --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "invert-pseudo"
+$TS_CMD_FINDMNT --invert --pseudo --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "pairs"
+$TS_CMD_FINDMNT --pairs --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "direction-forward"
+$TS_CMD_FINDMNT --types cgroup --direction forward --first-only --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "direction-backward"
+$TS_CMD_FINDMNT --types cgroup --direction backward --first-only --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "bytes"
+$TS_CMD_FINDMNT --types ext3 --output AVAIL --noheadings --bytes --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+sed -i -e 's/^[[:space:]]*[0-9]*$/<bytes>/g' "$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "verify"
+TEST_TABLE="$TS_OUTDIR/$TS_TESTNAME.table"
+cat <<'EOF' >"$TEST_TABLE"
+/dev/null /           ext4    defaults        0       2
+EOF
+# expected fail
+$TS_CMD_FINDMNT --verify --verbose --tab-file "$TEST_TABLE" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+rm -f "$TEST_TABLE"
+ts_finalize_subtest
+
+ts_init_subtest "nofsroot"
+$TS_CMD_FINDMNT --nofsroot --tab-file "$TS_SELF/files/mountinfo-messy" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "output-all"
+avail_cols="$("$TS_CMD_FINDMNT" --list-columns | awk '{print $1}' \
+                    | sed -E '/(ACTION|OLD-(OPTIONS|TARGET))/d' \
+                    | sort )"
+
+printed_columns="$("$TS_CMD_FINDMNT" --output-all --tab-file "$TS_SELF/files/mountinfo" \
+                    | sed -e 's/ /\n/g' -e '1q' \
+                    | sed -e '/^[[:space:]]*$/d' \
+                    | sort)"
+
+comm -13 <(echo "$avail_cols") <(echo "$printed_columns" | sort) >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+
+ts_finalize_subtest
+
+ts_init_subtest "ascii"
+LC_ALL=C.UTF-8 $TS_CMD_FINDMNT --all --ascii --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "json"
+$TS_CMD_FINDMNT --all --json --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "id"
+$TS_CMD_FINDMNT --id 15 --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+ts_finalize_subtest
+
+ts_init_subtest "hyperlink"
+$TS_CMD_FINDMNT --all --noheadings --hyperlink=always --tab-file "$TS_SELF/files/mountinfo" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+osc8_start_sequence="$($TS_CMD_HEXDUMP --no-squeezing --length 5 --format '"%_c"' "$TS_OUTPUT" 2>>"$TS_ERRLOG")"
+echo "$osc8_start_sequence" >"$TS_OUTPUT"
+ts_finalize_subtest
+
+ts_init_subtest "canonicalization"
+# We'll create a symlink to the filesystem root directory
+# and test whether findmnt properly canonicalizes it to its
+# real path.
+TEST_LINK="$TS_OUTDIR/fakelink"
+
+if ! ln -s / "$TEST_LINK"; then
+    ts_skip_subtest "failed to create symbolic link to root filesystem"
+else
+    # This return the right mount target
+    $TS_CMD_FINDMNT --output TARGET --canonicalize "$TEST_LINK" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+    # This should not return anything
+    $TS_CMD_FINDMNT --output TARGET --nocanonicalize "$TEST_LINK" >>"$TS_OUTPUT" 2>>"$TS_ERRLOG"
+    rm -f "$TEST_LINK"
+    ts_finalize_subtest
+fi
 
 ts_init_subtest "default"
 $TS_CMD_FINDMNT --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"