test: refresh build-sys tests

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

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 5c286977280ddd295348204b808c327f37cebf6d..ae5e589377d67f206477d60caa24e72b94c38210 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -389,8 +389,9 @@ wipe_device(int fd, const char *devname, int force, int is_blkdev)
        char *type = NULL;
        int whole = 0;
        int zap = 1;
+#ifdef HAVE_LIBBLKID
        blkid_probe pr = NULL;
-
+#endif
        if (!force) {
                if (lseek(fd, 0, SEEK_SET) != 0)
                        errx(EXIT_FAILURE, _("unable to rewind swap-device"));

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index 5944b4a67eef75bebd9d379c563bd8c3539eca0c..9328e62c8270413f6c6e82d86ea8674749951951 100644 (file)
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -36,7 +36,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -66,10 +65,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
-losetup.static: STATIC
 mount.static: STATIC
 mtab_lock_test:  
 umount.static: STATIC
@@ -80,6 +76,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libuuid 
+swapon:  libblkid libuuid 
 arch:  
 chcpu:  
 ctrlaltdel:  
@@ -93,6 +90,8 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
+losetup.static: STATIC
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index 5944b4a67eef75bebd9d379c563bd8c3539eca0c..9328e62c8270413f6c6e82d86ea8674749951951 100644 (file)
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -36,7 +36,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -66,10 +65,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
-losetup.static: STATIC
 mount.static: STATIC
 mtab_lock_test:  
 umount.static: STATIC
@@ -80,6 +76,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libuuid 
+swapon:  libblkid libuuid 
 arch:  
 chcpu:  
 ctrlaltdel:  
@@ -93,6 +90,8 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
+losetup.static: STATIC
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index 74cb8bba26afc0091000cf1db2b58f3da1471af8..eeeb9a7c7b66ea27952e905f7f23ef979b21c79d 100644 (file)
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -33,7 +33,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -59,9 +58,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
 mtab_lock_test:  
 partx:  libblkid libuuid 
 addpart:  
@@ -70,6 +67,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libuuid 
+swapon:  libblkid libuuid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -82,6 +80,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index fc61b300b52e1f497a0a5144c0e5e9f0cf3a2320..921923c17795f26e071a2b3ac52c482fddf61663 100644 (file)
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -33,7 +33,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -54,9 +53,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
 mtab_lock_test:  
 partx:  libblkid libuuid 
 addpart:  
@@ -65,6 +62,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libuuid 
+swapon:  libblkid libuuid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -77,6 +75,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index 644fe286df589a1c89d40bc1e011278e7b150f8a..d32a49c688114b795d6b6b51c8212dc755e69fe0 100644 (file)
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -36,7 +36,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libselinux libsepol libuuid 
 libmount.so.1.1.0:  libblkid libselinux libsepol libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -66,10 +65,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libmount libselinux libsepol libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libmount libselinux libsepol libuuid 
-losetup:  
-losetup.static: STATIC
 mount.static: STATIC
 umount.static: STATIC
 partx:  libblkid libuuid 
@@ -79,6 +75,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libselinux libsepol libuuid 
+swapon:  libblkid libuuid 
 arch:  
 chcpu:  
 ctrlaltdel:  
@@ -92,6 +89,8 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
+losetup.static: STATIC
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-devel-new-mount b/tests/expected/build-sys/config-devel-new-mount
new file mode 100644 (file)
index 0000000..75c9866
--- /dev/null
+++ b/tests/expected/build-sys/config-devel-new-mount
@@ -0,0 +1,125 @@
+mkswap:  libblkid libselinux libuuid 
+swaplabel:  libblkid libuuid 
+blockdev:  
+elvtune:  
+fdformat:  
+fsck.cramfs:  libz 
+fsck.minix:  
+isosize:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+raw:  
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+fdisk:  libblkid libuuid 
+fdisk.static: STATIC
+sfdisk:  
+sfdisk.static: STATIC
+fsck:  libblkid libuuid 
+getopt:  
+hwclock:  libaudit 
+test_at:  
+test_blkdev:  
+test_canonicalize:  
+test_cpuset:  
+test_ismounted:  
+test_loopdev:  
+test_mangle:  
+test_procutils:  
+test_strutils:  
+test_sysfs:  
+test_tt:  
+test_wholedisk:  
+mkfs:  libblkid libuuid 
+partitions:  libblkid libuuid 
+superblocks:  libblkid libuuid 
+topology:  libblkid libuuid 
+libblkid.so.1.1.0:  libuuid 
+libmount.so.1.1.0:  libblkid libselinux libsepol libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+tst_uuid:  libuuid 
+chfn:  libpam libpam_misc libselinux 
+chsh:  libpam libpam_misc libselinux 
+last:  
+login:  libaudit libpam libpam_misc libselinux 
+newgrp:  rypt 
+test_islocal:  
+test_logindefs:  
+vipw:  libselinux 
+blkid:  libblkid libuuid 
+findfs:  libblkid libuuid 
+findmnt:  libblkid libmount libselinux libsepol libuuid 
+lsblk:  libblkid libudev libuuid 
+uuidd:  libuuid 
+uuidgen:  libuuid 
+wipefs:  libblkid libuuid 
+blkid.static: STATIC
+cal:  libncursesw libtinfo 
+ddate:  
+kill:  
+logger:  
+look:  
+mcookie:  
+namei:  
+rename:  
+whereis:  
+partx:  libblkid libuuid 
+addpart:  
+delpart:  
+chrt:  
+ionice:  
+taskset:  
+mount:  libblkid libmount libselinux libsepol libuuid 
+mountpoint:  libblkid libmount libselinux libsepol libuuid 
+swapon:  libblkid libuuid 
+umount:  libblkid libmount libselinux libsepol libuuid 
+arch:  
+chcpu:  
+ctrlaltdel:  
+cytune:  
+dmesg:  
+fallocate:  
+flock:  
+fsfreeze:  
+fstrim:  
+ipcmk:  
+ipcrm:  
+ipcs:  
+ldattach:  
+losetup:  
+losetup.static: STATIC
+lscpu:  
+mount.static: STATIC
+pivot_root:  
+prlimit:  
+readprofile:  
+renice:  
+rtcwake:  
+setarch:  
+setsid:  
+switch_root:  
+tunelp:  
+umount.static: STATIC
+unshare:  
+agetty:  
+mesg:  
+script:  libutempter libutil 
+scriptreplay:  
+setterm:  libtinfo 
+write:  
+test_byteswap:  
+test_md5:  
+test_pathnames:  
+test_sysinfo:  
+col:  
+colcrt:  
+colrm:  
+column:  
+hexdump:  
+line:  
+more:  libtinfo 
+pg:  libncursesw libtinfo 
+rev:  
+tailf:  
+ul:  libtinfo 

diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index 8603afbca6c38b84ca8f0e9c834c3e7001560524..01f2bfc4b35f2242486d8248aab7b9592e19c26c 100644 (file)
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -54,6 +54,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index b08329172d74aff0ef568168905f4b694a874207..f1fa270007b42aeb547fb0cdba262c7f50274d37 100644 (file)
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -51,9 +51,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
 mtab_lock_test:  
 partx:  libblkid libuuid 
 addpart:  
@@ -61,6 +59,7 @@ delpart:
 chrt:  
 ionice:  
 taskset:  
+swapon:  libblkid libuuid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -73,6 +72,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index 6367ce9943c27973bac62ab0f3fe0f6e13195ee9..8b0684abd066115922ee4df23dd1b6e35bf47017 100644 (file)
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -50,6 +50,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index f959e6784bd5266b858307889cc54fb4b254b422..24f41b8014ab55ed45f57d9d13900f24c15420fc 100644 (file)
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -33,7 +33,6 @@ partitions:  libblkid
 superblocks:  libblkid 
 topology:  libblkid 
 libblkid.so.1.1.0:  
-mount:  libblkid libmount 
 libmount.so.1.1.0:  libblkid 
 test_islocal:  
 test_logindefs:  
@@ -50,9 +49,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid 
-swapon:  libblkid 
 umount:  libblkid 
-losetup:  
 mtab_lock_test:  
 partx:  libblkid 
 addpart:  
@@ -61,6 +58,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount 
+swapon:  libblkid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -73,6 +71,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index fc61b300b52e1f497a0a5144c0e5e9f0cf3a2320..921923c17795f26e071a2b3ac52c482fddf61663 100644 (file)
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -33,7 +33,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -54,9 +53,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
 mtab_lock_test:  
 partx:  libblkid libuuid 
 addpart:  
@@ -65,6 +62,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libuuid 
+swapon:  libblkid libuuid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -77,6 +75,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index c45ae84939bc7b1441d6faa0db0546b034ce8dec..5039ad0c329f012259d91521319240b99ed04c08 100644 (file)
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -33,7 +33,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libselinux libsepol libuuid 
 libmount.so.1.1.0:  libblkid libselinux libsepol libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -59,9 +58,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libselinux libsepol libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
 mtab_lock_test:  
 partx:  libblkid libuuid 
 addpart:  
@@ -70,6 +67,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libselinux libsepol libuuid 
+swapon:  libblkid libuuid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -82,6 +80,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 8b2efaf84c0025446a077b243db98d6dbc5aed0f..812add451dbb5784b5177524f0cbf62dc2d24b18 100644 (file)
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -33,7 +33,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -54,9 +53,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
 mtab_lock_test:  
 partx:  libblkid libuuid 
 addpart:  
@@ -65,6 +62,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libuuid 
+swapon:  libblkid libuuid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -77,6 +75,7 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index f62d2c4476785a94331fa84f3cbdd928046e01d1..5fb96994c778ef93572663db8c51d701e64d6a8b 100644 (file)
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -35,7 +35,6 @@ partitions:  libblkid libuuid
 superblocks:  libblkid libuuid 
 topology:  libblkid libuuid 
 libblkid.so.1.1.0:  libuuid 
-mount:  libblkid libmount libuuid 
 libmount.so.1.1.0:  libblkid libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
 tst_uuid:  libuuid 
@@ -57,10 +56,7 @@ namei:
 rename:  
 whereis:  
 mount:  libblkid libuuid 
-swapon:  libblkid libuuid 
 umount:  libblkid libuuid 
-losetup:  
-losetup.static: STATIC
 mount.static: STATIC
 mtab_lock_test:  
 umount.static: STATIC
@@ -71,6 +67,7 @@ chrt:
 ionice:  
 taskset:  
 mountpoint:  libblkid libmount libuuid 
+swapon:  libblkid libuuid 
 chcpu:  
 ctrlaltdel:  
 cytune:  
@@ -83,6 +80,8 @@ ipcmk:
 ipcrm:  
 ipcs:  
 ldattach:  
+losetup:  
+losetup.static: STATIC
 lscpu:  
 pivot_root:  
 prlimit:  

diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config
index 87308ba3a10f366876181a1880c6787abdf26b50..7ede38ca84fba2f5020cde011d8f788f3bc8a9ae 100755 (executable)
--- a/tests/ts/build-sys/config
+++ b/tests/ts/build-sys/config
@@ -27,11 +27,11 @@ for conf in $config_gen_dir/config-gen.d/*.conf; do
        opts=$(ul_get_configuration $conf)
 
        olddir=$(pwd)
-       cd $top_builddir        
+       cd $top_builddir
 
        ./configure $opts &> /dev/null
        make -j &> /dev/null
-       
+
        bins=$(find . -type f -perm /a+x | sort)
        for b in $bins; do
                libs=$(readelf --dynamic $b 2> /dev/null   | \