From 00862c3ba1eedf3b1e809c31d9436044a2a9a71f34f3e3701146e041034f555a Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 7 Apr 2024 20:16:21 +0000 Subject: [PATCH] Accepting request 1165983 from home:Andreas_Schwab:Factory - Skip tests marked as ts_skip_qemu_user when running under qemu - Mark racy lslocks test as known fail OBS-URL: https://build.opensuse.org/request/show/1165983 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=556 --- util-linux.changes | 6 ++++++ util-linux.spec | 16 ++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index a33332b..16e4a8b 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 6 19:53:02 UTC 2024 - Andreas Schwab + +- Skip tests marked as ts_skip_qemu_user when running under qemu +- Mark racy lslocks test as known fail + ------------------------------------------------------------------- Fri Apr 5 15:55:44 UTC 2024 - Stanislav Brabec diff --git a/util-linux.spec b/util-linux.spec index 993e354..ac675ce 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -712,18 +712,8 @@ rm -r %{buildroot}{%{_bindir},%{_mandir},%{_datadir},%{_includedir},%{_libdir}/{ # mark some tests "known_fail" # %if 0%{?qemu_user_space_build} -export TS_OPT_fdisk_gpt_known_fail="yes" -export TS_OPT_fdisk_oddinput_known_fail="yes" -export TS_OPT_fdisk_sunlabel_known_fail="yes" -export TS_OPT_fincore_count_known_fail="yes" -export TS_OPT_libfdisk_gpt_known_fail="yes" -export TS_OPT_misc_flock_known_fail="yes" -export TS_OPT_misc_ionice_known_fail="yes" -export TS_OPT_misc_swaplabel_known_fail="yes" -export TS_OPT_kill_name_to_number_known_fail="yes" -export TS_OPT_kill_print_pid_known_fail="yes" -export TS_OPT_kill_queue_known_fail="yes" -export TS_OPT_uuid_uuidd_known_fail="yes" +# skip tests marked as ts_skip_qemu_user +export QEMU_USER=1 # unsupported syscall in script(1) ... might be fixed in qemu export TS_OPT_script_known_fail="yes" # may segfault on qemu-user-space @@ -735,6 +725,8 @@ export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_hardlink_options_known_fail="yes" # This does not work with a chroot build: / is not a mountpoint export TS_OPT_misc_mountpoint_known_fail="yes" +# This test appears to be racy +export TS_OPT_lslocks_lslocks_known_fail=yes # # hacks export PATH="$PATH:/sbin:/usr/sbin"