diff options
author | Karel Zak <kzak@redhat.com> | 2015-02-04 11:34:39 +0100 |
---|---|---|
committer | Karel Zak <kzak@redhat.com> | 2015-02-04 11:34:39 +0100 |
commit | 5d9d03ceaf42018340f7bef88e898953554b150d (patch) | |
tree | 4087828e34021a9e03095324b6917a5340314ba3 | |
parent | 2d5ae6d80a165ac06f3f9ffc1e6a12a6a7d93545 (diff) | |
download | util-linux-playground-5d9d03ceaf42018340f7bef88e898953554b150d.tar.gz |
tests: update build-sys tests
The systemd libs are merged into one shared library only.
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | tests/expected/build-sys/config-all | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-all-non-nls | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-audit | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-chfnsh-libuser | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-chfnsh-no-password | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-chfnsh-pam | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-core | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-devel | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-devel-non-docs | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-non-libblkid | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-non-libmount | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-non-libs | 2 | ||||
-rw-r--r-- | tests/expected/build-sys/config-non-libsmartcols | 4 | ||||
-rw-r--r-- | tests/expected/build-sys/config-non-libuuid | 4 | ||||
-rw-r--r-- | tests/expected/build-sys/config-non-nls | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-selinux | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-slang | 6 | ||||
-rw-r--r-- | tests/expected/build-sys/config-static | 6 |
18 files changed, 50 insertions, 50 deletions
diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all index 956db97535..47336f0c1d 100644 --- a/tests/expected/build-sys/config-all +++ b/tests/expected/build-sys/config-all @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libsmartcols libuuid -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -66,7 +66,7 @@ kill: last: ldattach: line: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls index 956db97535..47336f0c1d 100644 --- a/tests/expected/build-sys/config-all-non-nls +++ b/tests/expected/build-sys/config-all-non-nls @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libsmartcols libuuid -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -66,7 +66,7 @@ kill: last: ldattach: line: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit index 73c1150aee..ca32b61346 100644 --- a/tests/expected/build-sys/config-audit +++ b/tests/expected/build-sys/config-audit @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libsmartcols libuuid -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libaudit libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser index b866ab5f3f..43e83526a3 100644 --- a/tests/expected/build-sys/config-chfnsh-libuser +++ b/tests/expected/build-sys/config-chfnsh-libuser @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libselinux libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libselinux libsmartcols libuuid -lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libselinux libsmartcols libsystemd mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libaudit libpam libpam_misc libselinux look: mcookie: diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password index 4141068eba..b9c55267e0 100644 --- a/tests/expected/build-sys/config-chfnsh-no-password +++ b/tests/expected/build-sys/config-chfnsh-no-password @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libselinux libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libselinux libsmartcols libuuid -lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libselinux libsmartcols libsystemd mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libaudit libpam libpam_misc libselinux look: mcookie: diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam index c03ead9d44..5de2e796c8 100644 --- a/tests/expected/build-sys/config-chfnsh-pam +++ b/tests/expected/build-sys/config-chfnsh-pam @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libselinux libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libselinux libsmartcols libuuid -lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libselinux libsmartcols libsystemd mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libaudit libpam libpam_misc libselinux look: mcookie: diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core index 4d25b68b29..bf53c7e055 100644 --- a/tests/expected/build-sys/config-core +++ b/tests/expected/build-sys/config-core @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libsmartcols libuuid -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel index d039ab3cf7..4053bbc81d 100644 --- a/tests/expected/build-sys/config-devel +++ b/tests/expected/build-sys/config-devel @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libselinux libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libselinux libsmartcols libuuid -lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libselinux libsmartcols libsystemd mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -66,7 +66,7 @@ kill: last: ldattach: line: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libaudit libpam libpam_misc libselinux look: mcookie: diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs index d039ab3cf7..4053bbc81d 100644 --- a/tests/expected/build-sys/config-devel-non-docs +++ b/tests/expected/build-sys/config-devel-non-docs @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libselinux libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libselinux libsmartcols libuuid -lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libselinux libsmartcols libsystemd mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -66,7 +66,7 @@ kill: last: ldattach: line: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libaudit libpam libpam_misc libselinux look: mcookie: diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid index b79b9ad498..b9b5ade05f 100644 --- a/tests/expected/build-sys/config-non-libblkid +++ b/tests/expected/build-sys/config-non-libblkid @@ -5,11 +5,11 @@ libsmartcols.so.1.1.0: libuuid.so.1.3.0: losetup: libsmartcols lscpu: libsmartcols -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libuuid prlimit: libsmartcols sfdisk: libfdisk libsmartcols libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols zramctl: libsmartcols @@ -44,7 +44,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount index d0a6a07017..2141060e6c 100644 --- a/tests/expected/build-sys/config-non-libmount +++ b/tests/expected/build-sys/config-non-libmount @@ -8,13 +8,13 @@ libsmartcols.so.1.1.0: libuuid.so.1.3.0: losetup: libsmartcols lscpu: libsmartcols -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid partx: libblkid libsmartcols libuuid prlimit: libsmartcols sfdisk: libblkid libfdisk libsmartcols libuuid swaplabel: libblkid libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -52,7 +52,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs index 2e17425842..fbee6c67e5 100644 --- a/tests/expected/build-sys/config-non-libs +++ b/tests/expected/build-sys/config-non-libs @@ -29,7 +29,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols index 56a3760c0f..29267bdcee 100644 --- a/tests/expected/build-sys/config-non-libsmartcols +++ b/tests/expected/build-sys/config-non-libsmartcols @@ -13,7 +13,7 @@ mountpoint: libblkid libmount libuuid pylibmount.so: libblkid libmount libpython2 libuuid swaplabel: libblkid libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wipefs: libblkid libuuid agetty: @@ -47,7 +47,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid index f9f2819b1f..80568dcb37 100644 --- a/tests/expected/build-sys/config-non-libuuid +++ b/tests/expected/build-sys/config-non-libuuid @@ -11,7 +11,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev lscpu: libsmartcols lslocks: libblkid libmount libsmartcols -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid mount: libblkid libmount mountpoint: libblkid libmount @@ -58,7 +58,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls index 4d25b68b29..bf53c7e055 100644 --- a/tests/expected/build-sys/config-non-nls +++ b/tests/expected/build-sys/config-non-nls @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libsmartcols libuuid -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux index 49ba264d18..a8339d494c 100644 --- a/tests/expected/build-sys/config-selinux +++ b/tests/expected/build-sys/config-selinux @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libselinux libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libselinux libsmartcols libuuid -lslogins: libselinux libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libselinux libsmartcols libsystemd mkswap: libblkid libselinux libuuid mount: libblkid libmount libselinux libuuid mountpoint: libblkid libmount libselinux libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libselinux libuuid swapon: libblkid libmount libselinux libsmartcols libuuid umount: libblkid libmount libselinux libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc libselinux look: mcookie: diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang index d4e93b1f5d..34c6d3ac9d 100644 --- a/tests/expected/build-sys/config-slang +++ b/tests/expected/build-sys/config-slang @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libsmartcols libuuid -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -65,7 +65,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: mcookie: diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static index e1a2063d59..38e643d49b 100644 --- a/tests/expected/build-sys/config-static +++ b/tests/expected/build-sys/config-static @@ -15,7 +15,7 @@ losetup: libsmartcols lsblk: libblkid libmount libsmartcols libudev libuuid lscpu: libsmartcols lslocks: libblkid libmount libsmartcols libuuid -lslogins: libsmartcols libsystemd-id128 libsystemd-journal +lslogins: libsmartcols libsystemd mkswap: libblkid libuuid mount: libblkid libmount libuuid mountpoint: libblkid libmount libuuid @@ -27,7 +27,7 @@ swaplabel: libblkid libuuid swapoff: libblkid libmount libuuid swapon: libblkid libmount libsmartcols libuuid umount: libblkid libmount libuuid -uuidd: libsystemd-daemon libuuid +uuidd: libsystemd libuuid uuidgen: libuuid wdctl: libsmartcols wipefs: libblkid libuuid @@ -67,7 +67,7 @@ isosize: kill: last: ldattach: -logger: libsystemd-id128 libsystemd-journal +logger: libsystemd login: libpam libpam_misc look: losetup.static: STATIC |