tests: add STATIC binaries to build-sys tests

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

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index 32c9b427f98ac6624a6d6db5895772d3cffdd082..cc8cb0ab9c088e39c1e69382dc87cb8caa43925e 100644 (file)
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -81,6 +83,7 @@ line:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -88,10 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -109,13 +114,16 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 vipw:  
 wall:  

diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index 32c9b427f98ac6624a6d6db5895772d3cffdd082..cc8cb0ab9c088e39c1e69382dc87cb8caa43925e 100644 (file)
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -81,6 +83,7 @@ line:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -88,10 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -109,13 +114,16 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 vipw:  
 wall:  

diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index 65591f43a95bc9f4cb53a5081aedaa8dc9641f08..3ad427724904b4b251cd28692cd1bd454deb649d 100644 (file)
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index 0e5de45c67a77bc98e4eb8b610518ee9c7c3e142..ffc78749ce72d7b9daf7cf4646b05622162d4e6c 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index 2480c82e5e0647cd73507a93593c29f3a40c23ec..432d1c4bf932101f53a867a9e2ef0da1650afcab 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index e38f21d2947292581056e27abcd5bab8503f61df..53ce4ad1be240d26aeb7992b3d76b34af9d89b2a 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index f37f79e7d71016bbc19df7e05c02e7306ee8a925..9dc397079eeb81543e6bf802e329315b997a87b1 100644 (file)
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index 1726de79d96ba41cd0ecd79d67bbf7a554167687..620ee7177b498d6d18b137c0503e8cbe23e33fb3 100644 (file)
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -81,6 +83,7 @@ line:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -88,10 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
+nsenter.static: STATIC
 pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -109,13 +114,16 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 vipw:  libselinux 
 wall:  

diff --git a/tests/expected/build-sys/config-devel-non-asan b/tests/expected/build-sys/config-devel-non-asan
index 1726de79d96ba41cd0ecd79d67bbf7a554167687..620ee7177b498d6d18b137c0503e8cbe23e33fb3 100644 (file)
--- a/tests/expected/build-sys/config-devel-non-asan
+++ b/tests/expected/build-sys/config-devel-non-asan
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -81,6 +83,7 @@ line:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -88,10 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
+nsenter.static: STATIC
 pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -109,13 +114,16 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 vipw:  libselinux 
 wall:  

diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index 1726de79d96ba41cd0ecd79d67bbf7a554167687..620ee7177b498d6d18b137c0503e8cbe23e33fb3 100644 (file)
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -81,6 +83,7 @@ line:
 logger:  libsystemd 
 login:  libaudit libpam libpam_misc libselinux 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -88,10 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
+nsenter.static: STATIC
 pg:  libdl libncursesw libtinfo 
 pivot_root:  
 raw:  
@@ -109,13 +114,16 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 vipw:  libselinux 
 wall:  

diff --git a/tests/expected/build-sys/config-disable-all b/tests/expected/build-sys/config-disable-all
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..05e4de65f65c16ceba0ceb4c6a9a4bd0948dedb9 100644 (file)
--- a/tests/expected/build-sys/config-disable-all
+++ b/tests/expected/build-sys/config-disable-all
@@ -0,0 +1,8 @@
+blkid.static: STATIC
+fdisk.static: STATIC
+losetup.static: STATIC
+mount.static: STATIC
+nsenter.static: STATIC
+sfdisk.static: STATIC
+umount.static: STATIC
+unshare.static: STATIC

diff --git a/tests/expected/build-sys/config-enable-schedutils b/tests/expected/build-sys/config-enable-schedutils
index cd34c8e8c979197873ab9404609a4e46f151186d..a5c72d8375b59be7c3ddc0df744c45089e8b50a5 100644 (file)
--- a/tests/expected/build-sys/config-enable-schedutils
+++ b/tests/expected/build-sys/config-enable-schedutils
@@ -1,3 +1,11 @@
+blkid.static: STATIC
 chrt:  
+fdisk.static: STATIC
 ionice:  
+losetup.static: STATIC
+mount.static: STATIC
+nsenter.static: STATIC
+sfdisk.static: STATIC
 taskset:  
+umount.static: STATIC
+unshare.static: STATIC

diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index ace1bfba35e2e5298039634a363434f564bf72a7..c9dabb0d5652f8e2470ce08fe0192eb7f570271d 100644 (file)
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -23,6 +23,7 @@ wdctl:  libsmartcols
 zramctl:  libsmartcols 
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -39,6 +40,7 @@ ctrlaltdel:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -58,6 +60,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -65,9 +68,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -83,12 +88,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 366b4cd23a9528c8323089575da20f7bc7cb5381..411a091f1d1095e2835d9a0d1e5c3f1b0481c2c1 100644 (file)
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -30,6 +30,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -47,6 +48,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -66,6 +68,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -73,9 +76,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -92,12 +97,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index d5cb7fe8297959da0126ef091faef1198ad23d2d..c074435ad599531310ddef7ee27f135ddcedc160 100644 (file)
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -1,5 +1,6 @@
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -16,6 +17,7 @@ ctrlaltdel:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -35,6 +37,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -43,9 +46,11 @@ mkfs.cramfs:  libz
 mkfs.minix:  
 mkswap:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -61,12 +66,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index cae62c5f49b9b6d5b5efe07bfba05d41d3dc0ca2..d2b730fc3a83ea9bb39a5eba904f6119b0a99f18 100644 (file)
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -17,6 +17,7 @@ uuidd:  librt libsystemd libuuid
 uuidgen:  libuuid 
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -33,6 +34,7 @@ ctrlaltdel:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -52,6 +54,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -59,9 +62,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -77,12 +82,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 899469d6e88e38d2fe9c7fe8f8673d613b9b1dec..5364415fd435696bba437eb11585699f4fd53cb5 100644 (file)
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -36,6 +36,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -53,6 +54,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -72,6 +74,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -79,9 +82,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -98,12 +103,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index f37f79e7d71016bbc19df7e05c02e7306ee8a925..9dc397079eeb81543e6bf802e329315b997a87b1 100644 (file)
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-widechar b/tests/expected/build-sys/config-non-widechar
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..05e4de65f65c16ceba0ceb4c6a9a4bd0948dedb9 100644 (file)
--- a/tests/expected/build-sys/config-non-widechar
+++ b/tests/expected/build-sys/config-non-widechar
@@ -0,0 +1,8 @@
+blkid.static: STATIC
+fdisk.static: STATIC
+losetup.static: STATIC
+mount.static: STATIC
+nsenter.static: STATIC
+sfdisk.static: STATIC
+umount.static: STATIC
+unshare.static: STATIC

diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index d0c63b18fdd99b4e508dc6003c048a4d20bb8d75..f677ef75cc07218c6d4c2f61768b6f691366aace 100644 (file)
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc libselinux 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  libselinux 
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt libselinux 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 1234908315b00be4eb15e5a38bce4d60a4dcf902..92ab9b17698398f23044d9e92215e80ef61514f9 100644 (file)
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -44,6 +44,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkdiscard:  librt 
+blkid.static: STATIC
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ delpart:
 dmesg:  librt libtinfo 
 fallocate:  
 fdformat:  
+fdisk.static: STATIC
 flock:  librt 
 fsck.cramfs:  libz 
 fsck.minix:  
@@ -80,6 +82,7 @@ ldattach:
 logger:  libsystemd 
 login:  libpam libpam_misc 
 look:  
+losetup.static: STATIC
 mcookie:  
 mesg:  
 mkfs:  
@@ -87,9 +90,11 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
+mount.static: STATIC
 namei:  
 nologin:  
 nsenter:  
+nsenter.static: STATIC
 pivot_root:  
 raw:  
 readprofile:  
@@ -106,12 +111,15 @@ setarch:
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
+sfdisk.static: STATIC
 su:  libpam libpam_misc librt libutil 
 sulogin:  libcrypt 
 switch_root:  
 taskset:  
 ul:  libtinfo 
+umount.static: STATIC
 unshare:  
+unshare.static: STATIC
 utmpdump:  
 wall:  
 whereis: