tests: update 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 68c424026b81a1ea7d603e3ccf024da090400404..2b2a48717d43e6e568c0c32535052bed46aba46f 100644 (file)
--- 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 68c424026b81a1ea7d603e3ccf024da090400404..2b2a48717d43e6e568c0c32535052bed46aba46f 100644 (file)
--- 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 2ea9c87bdc519c398337a249e5de053679376d9d..4f37b1c86ad938d4496a9021190f660330ee01b4 100644 (file)
--- 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 3f024939ff36cc9dc89922f763ace70e11594ac3..4863257deff556eda11e99eaa540b31462c8a3a4 100644 (file)
--- 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 c61083922646dafcf69c832a98cd6bcb40a9effc..09831b6b8161780c78c358358a8e8c784b343778 100644 (file)
--- 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 e4d314778ee8432522c7f512f8047e6aff9e9b77..ccf072845ee348e6ca0ee8cd14f6f3e17d4b42a0 100644 (file)
--- 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 890a84c157b9a98143296cda755a3eff60b42bab..1d14682332aba7ac0f88e3b9a3a11d6cb65773ce 100644 (file)
--- 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 2697ba9f87f6afc47cd6f28ae5b0916d8d51d0a5..ef6c556cd0aa35f8337bb137a267c1e245ee83ed 100644 (file)
--- 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 2697ba9f87f6afc47cd6f28ae5b0916d8d51d0a5..ef6c556cd0aa35f8337bb137a267c1e245ee83ed 100644 (file)
--- 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 45bdd595920a0bafc0227e9ab347b44755ebbf75..c284f0836f475d4fbe006f419589d01107c23194 100644 (file)
--- 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 a4fb9a12c483d340d114e4818acc86befd42aded..22e1f9637fccfa913afa9af75e6bb849b62841ff 100644 (file)
--- 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 a4dd4e8da4d84f7ec7d86162bc5f88c3966213b3..46cc7bef96cc5361cf13566fbc83167361216f44 100644 (file)
--- 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 d41b307542b454f8d08281b881a6e474cc4c0b63..6279aa5904c2cc1ac94fdd2b9aa5dffa5b3541af 100644 (file)
--- 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 890a84c157b9a98143296cda755a3eff60b42bab..1d14682332aba7ac0f88e3b9a3a11d6cb65773ce 100644 (file)
--- 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 bbb3eadd4ed9095f255e711eb2e05180bdc20048..a9f2d606e8535cca838d5834bcc22e2f14c20592 100644 (file)
--- 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 8ad229734389f0812f1631e291898401fcfdaede..c0faa85ddde733aa05598317756a8198a0eb2b68 100644 (file)
--- 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 b90b94a85dc8f6e0e2d3da43f834bdb3a51256c5..7baebb95f885f131d0554b147179594567882afe 100644 (file)
--- 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 e41bae778672daa29aee12b7dd4876791ac0f85a..5b91300b7b60b8b757698c32abab0e56c16d3bcd 100644 (file)
--- 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: