From: Karel Zak Date: Fri, 17 Jan 2014 14:00:55 +0000 (+0100) Subject: tests: update build-sys tests X-Git-Tag: v2.25-rc1~629 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a2332edd9de308902d631933dbc2d93491f9c45;p=thirdparty%2Futil-linux.git tests: update build-sys tests Signed-off-by: Karel Zak --- diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all index 68c424026b..2b2a48717d 100644 --- a/tests/expected/build-sys/config-all +++ b/tests/expected/build-sys/config-all @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -45,7 +46,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls index 68c424026b..2b2a48717d 100644 --- a/tests/expected/build-sys/config-all-non-nls +++ b/tests/expected/build-sys/config-all-non-nls @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -45,7 +46,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit index 2ea9c87bdc..4f37b1c86a 100644 --- a/tests/expected/build-sys/config-audit +++ b/tests/expected/build-sys/config-audit @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -42,7 +43,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: libaudit diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser index 3f024939ff..4863257def 100644 --- a/tests/expected/build-sys/config-chfnsh-libuser +++ b/tests/expected/build-sys/config-chfnsh-libuser @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libselinux libudev libuuid fsck: libblkid libmount libselinux libuuid +fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid libuuid.so.1.3.0: @@ -44,7 +45,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: libaudit diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password index c610839226..09831b6b81 100644 --- a/tests/expected/build-sys/config-chfnsh-no-password +++ b/tests/expected/build-sys/config-chfnsh-no-password @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libselinux libudev libuuid fsck: libblkid libmount libselinux libuuid +fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid libuuid.so.1.3.0: @@ -44,7 +45,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: libaudit diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam index e4d314778e..ccf072845e 100644 --- a/tests/expected/build-sys/config-chfnsh-pam +++ b/tests/expected/build-sys/config-chfnsh-pam @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libselinux libudev libuuid fsck: libblkid libmount libselinux libuuid +fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid libuuid.so.1.3.0: @@ -44,7 +45,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: libaudit diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core index 890a84c157..1d14682332 100644 --- a/tests/expected/build-sys/config-core +++ b/tests/expected/build-sys/config-core @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -42,7 +43,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel index 2697ba9f87..ef6c556cd0 100644 --- a/tests/expected/build-sys/config-devel +++ b/tests/expected/build-sys/config-devel @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libselinux libudev libuuid fsck: libblkid libmount libselinux libuuid +fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid libuuid.so.1.3.0: @@ -45,7 +46,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: libaudit diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs index 2697ba9f87..ef6c556cd0 100644 --- a/tests/expected/build-sys/config-devel-non-docs +++ b/tests/expected/build-sys/config-devel-non-docs @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libselinux libudev libuuid fsck: libblkid libmount libselinux libuuid +fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid libuuid.so.1.3.0: @@ -45,7 +46,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: libaudit diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid index 45bdd59592..c284f0836f 100644 --- a/tests/expected/build-sys/config-non-libblkid +++ b/tests/expected/build-sys/config-non-libblkid @@ -23,7 +23,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount index a4fb9a12c4..22e1f9637f 100644 --- a/tests/expected/build-sys/config-non-libmount +++ b/tests/expected/build-sys/config-non-libmount @@ -31,7 +31,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs index a4dd4e8da4..46cc7bef96 100644 --- a/tests/expected/build-sys/config-non-libs +++ b/tests/expected/build-sys/config-non-libs @@ -18,7 +18,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid index d41b307542..6279aa5904 100644 --- a/tests/expected/build-sys/config-non-libuuid +++ b/tests/expected/build-sys/config-non-libuuid @@ -4,6 +4,7 @@ eject: libblkid libmount findfs: libblkid findmnt: libblkid libmount libudev fsck: libblkid libmount +fstrim: libblkid libmount libblkid.so.1.1.0: libmount.so.1.1.0: libblkid lsblk: libblkid libmount libudev @@ -38,7 +39,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls index 890a84c157..1d14682332 100644 --- a/tests/expected/build-sys/config-non-nls +++ b/tests/expected/build-sys/config-non-nls @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -42,7 +43,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-old-mount b/tests/expected/build-sys/config-old-mount index bbb3eadd4e..a9f2d606e8 100644 --- a/tests/expected/build-sys/config-old-mount +++ b/tests/expected/build-sys/config-old-mount @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -42,7 +43,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux index 8ad2297343..c0faa85ddd 100644 --- a/tests/expected/build-sys/config-selinux +++ b/tests/expected/build-sys/config-selinux @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libselinux libudev libuuid fsck: libblkid libmount libselinux libuuid +fstrim: libblkid libmount libselinux libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libselinux libuuid libuuid.so.1.3.0: @@ -42,7 +43,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang index b90b94a85d..7baebb95f8 100644 --- a/tests/expected/build-sys/config-slang +++ b/tests/expected/build-sys/config-slang @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -42,7 +43,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static index e41bae7786..5b91300b7b 100644 --- a/tests/expected/build-sys/config-static +++ b/tests/expected/build-sys/config-static @@ -5,6 +5,7 @@ fdisk: libblkid libuuid findfs: libblkid libuuid findmnt: libblkid libmount libudev libuuid fsck: libblkid libmount libuuid +fstrim: libblkid libmount libuuid libblkid.so.1.1.0: libuuid libmount.so.1.1.0: libblkid libuuid libuuid.so.1.3.0: @@ -44,7 +45,6 @@ flock: fsck.cramfs: libz fsck.minix: fsfreeze: -fstrim: getopt: hexdump: hwclock: