tests: update non-lib build tests

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

5 files changed, 276 insertions, 0 deletions

diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index ac6f11b77..943ae2a76 100644
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -2,6 +2,7 @@ libuuid.so.1.3.0:  ld-linux-x86-64
 mkswap:  libuuid 
 test_uuid:  libuuid 
 uuidd:  libuuid 
+uuidgen:  libuuid 
 agetty:  
 blockdev:  
 cal:  libncursesw libtinfo 
@@ -10,19 +11,25 @@ chcpu:
 chrt:  
 col:  
 colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
 dmesg:  
 fallocate:  
 fdformat:  
 fdisk:  ld-linux-x86-64 
+flock:  
 fsck.cramfs:  libz 
 fsck.minix:  
 fsfreeze:  
 fstrim:  
 getopt:  
+hexdump:  
 hwclock:  
 ionice:  
+ipcmk:  
+ipcrm:  
 ipcs:  
 isosize:  
 kill:  
@@ -58,6 +65,7 @@ sfdisk:
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  
+tailf:  
 taskset:  
 test_at:  
 test_blkdev:  
@@ -84,5 +92,6 @@ tunelp:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+wall:  
 wdctl:  
 whereis:  
diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 2df2303e1..357e626cf 100644
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -1,35 +1,97 @@
+blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
+findfs:  libblkid libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
+mkswap:  libblkid libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+test_uuid:  libuuid 
+uuidd:  libuuid 
+uuidgen:  libuuid 
+wipefs:  libblkid libuuid 
+addpart:  
+agetty:  
+blockdev:  
 cal:  libncursesw libtinfo 
+chcpu:  
+chrt:  
+col:  
 colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
+dmesg:  
 fallocate:  
+fdformat:  
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
+fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
+ldattach:  
 logger:  
+login:  libpam libpam_misc 
 look:  
+losetup:  
 lscpu:  
+lslocks:  
 mcookie:  
 mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
 more:  libtinfo 
 namei:  
 pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
 raw:  
+readprofile:  
+rename:  
 renice:  
 rev:  
+rtcwake:  
 script:  libutil 
 scriptreplay:  
 setarch:  
 setsid:  
 setterm:  libtinfo 
+sfdisk:  
 su:  libpam libpam_misc 
+sulogin:  rypt 
 switch_root:  
+tailf:  
+taskset:  
 test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
 test_canonicalize:  
 test_cpuset:  
@@ -37,6 +99,7 @@ test_fileutils:
 test_islocal:  
 test_ismounted:  
 test_logindefs:  
+test_loopdev:  
 test_mangle:  
 test_md5:  
 test_pager:  
@@ -44,9 +107,14 @@ test_pathnames:
 test_procutils:  
 test_randutils:  
 test_strutils:  
+test_sysfs:  
 test_sysinfo:  
+test_tt:  
 test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
 unshare:  
 utmpdump:  
 wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index 02d6af65e..d96699754 100644
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -1,15 +1,28 @@
 agetty:  
+blockdev:  
 cal:  libncursesw libtinfo 
+cfdisk:  libncursesw libtinfo 
+chcpu:  
+chrt:  
+col:  
 colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
 dmesg:  
 fallocate:  
 fdformat:  
+fdisk:  ld-linux-x86-64 
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
 getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
@@ -19,10 +32,15 @@ ldattach:
 logger:  
 login:  libpam libpam_misc 
 look:  
+losetup:  
 lscpu:  
 lslocks:  
 mcookie:  
 mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+mkswap:  
 more:  libtinfo 
 namei:  
 pg:  libncursesw libtinfo 
@@ -39,9 +57,12 @@ scriptreplay:
 setarch:  
 setsid:  
 setterm:  libtinfo 
+sfdisk:  
 su:  libpam libpam_misc 
 sulogin:  rypt 
 switch_root:  
+tailf:  
+taskset:  
 test_at:  
 test_blkdev:  
 test_byteswap:  
diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 32b0e3ae5..4605f20bd 100644
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -1,7 +1,26 @@
+blkid:  libblkid 
+cfdisk:  libblkid libncursesw libtinfo 
+eject:  libblkid libmount 
+fdisk:  ld-linux-x86-64 libblkid 
+findfs:  libblkid 
+findmnt:  libblkid libmount 
+fsck:  libblkid libmount 
 libblkid.so.1.1.0:  ld-linux-x86-64 
 libmount.so.1.1.0:  ld-linux-x86-64 libblkid 
+lsblk:  libblkid libmount libudev 
+mkswap:  libblkid 
+mount:  libblkid libmount 
+mountpoint:  libblkid libmount 
+partx:  libblkid 
 sample-mkfs:  libblkid 
 sample-partitions:  libblkid 
+sample-superblocks:  libblkid 
+sample-topology:  libblkid 
+swaplabel:  libblkid 
+swapoff:  libblkid libmount 
+swapon:  libblkid libmount 
+umount:  libblkid libmount 
+wipefs:  libblkid 
 addpart:  
 agetty:  
 blockdev:  
@@ -68,6 +87,17 @@ tailf:
 taskset:  
 test_at:  
 test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
 test_canonicalize:  
 test_cpuset:  
@@ -78,6 +108,15 @@ test_logindefs:
 test_loopdev:  
 test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
 test_pager:  
 test_pathnames:  
 test_procutils:  
diff --git a/tests/expected/build-sys/config-old-mount b/tests/expected/build-sys/config-old-mount
new file mode 100644
index 000000000..2dba0a0d1
--- /dev/null
+++ b/tests/expected/build-sys/config-old-mount
@@ -0,0 +1,139 @@
+blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
+findfs:  libblkid libuuid 
+findmnt:  libblkid libmount libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libuuid 
+uuidd:  libuuid 
+uuidgen:  libuuid 
+wipefs:  libblkid libuuid 
+addpart:  
+agetty:  
+blockdev:  
+cal:  libncursesw libtinfo 
+chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
+ctrlaltdel:  
+cytune:  
+delpart:  
+dmesg:  
+fallocate:  
+fdformat:  
+flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
+fsfreeze:  
+fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
+ipcmk:  
+ipcrm:  
+ipcs:  
+isosize:  
+kill:  
+ldattach:  
+logger:  
+login:  libpam libpam_misc 
+look:  
+losetup:  
+lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
+pivot_root:  
+prlimit:  
+raw:  
+readprofile:  
+rename:  
+renice:  
+rev:  
+rtcwake:  
+script:  libutil 
+scriptreplay:  
+setarch:  
+setsid:  
+setterm:  libtinfo 
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
+test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
+test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
+test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
+test_sysinfo:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
+ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis: