tests: update build-sys tests

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

18 files changed, 15 insertions, 18 deletions

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index 68c424026..2b2a48717 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 68c424026..2b2a48717 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 2ea9c87bd..4f37b1c86 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 3f024939f..4863257de 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 c61083922..09831b6b8 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 e4d314778..ccf072845 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 890a84c15..1d1468233 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 2697ba9f8..ef6c556cd 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 2697ba9f8..ef6c556cd 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 45bdd5959..c284f0836 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 a4fb9a12c..22e1f9637 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 a4dd4e8da..46cc7bef9 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 d41b30754..6279aa590 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 890a84c15..1d1468233 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 bbb3eadd4..a9f2d606e 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 8ad229734..c0faa85dd 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 b90b94a85..7baebb95f 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 e41bae778..5b91300b7 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: