diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh index 5262f80bb8..e30c98a0b8 100755 --- a/test/units/testsuite-17.10.sh +++ b/test/units/testsuite-17.10.sh @@ -9,18 +9,12 @@ set -o pipefail # Coverage test for udevadm cleanup_17_10() { - set +e + set +e - rmmod scsi_debug - rm -f /etc/udev/hwdb.d/99-test.hwdb - systemd-hwdb update + losetup -d "$loopdev" + rm -f "$blk" - losetup -d "$loopdev" - rm -f "$blk" - - ip link delete "$netdev" - - return 0 + ip link delete "$netdev" } # Set up some test devices @@ -33,14 +27,6 @@ blk="$(mktemp)" dd if=/dev/null of="$blk" bs=1M count=1 loopdev="$(losetup --show -f "$blk")" -modprobe scsi_debug -scsidev=$(readlink -f /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/[0-9]*) -cat > /etc/udev/hwdb.d/99-test.hwdb < /dev/null +udevadm info -t >/dev/null udevadm info --tree /sys/class/net/$netdev udevadm info -x /sys/class/net/$netdev udevadm info -x -q path /sys/class/net/$netdev udevadm info -P TEST_ /sys/class/net/$netdev udevadm info -d /dev/null -udevadm info -e > /dev/null +udevadm info -e >/dev/null # udevadm info -c udevadm info -w /sys/class/net/$netdev udevadm info --wait-for-initialization=5 /sys/class/net/$netdev @@ -117,11 +103,11 @@ udevadm test -a bind /sys/class/net/$netdev udevadm test -a unbind /sys/class/net/$netdev udevadm test -a help /sys/class/net/$netdev udevadm test --action help -(! udevadm test -a hello /sys/class/net/$netdev ) +(! udevadm test -a hello /sys/class/net/$netdev) udevadm test -N early /sys/class/net/$netdev udevadm test -N late /sys/class/net/$netdev udevadm test --resolve-names never /sys/class/net/$netdev -(! udevadm test -N hello /sys/class/net/$netdev ) +(! udevadm test -N hello /sys/class/net/$netdev) udevadm test -h # udevadm test-builtin path_id "$loopdev" @@ -138,13 +124,31 @@ udevadm test-builtin -a unbind net_id /sys/class/net/$netdev udevadm test-builtin -a help net_id /sys/class/net/$netdev udevadm test-builtin net_setup_link /sys/class/net/$netdev udevadm test-builtin blkid "$loopdev" -udevadm test-builtin hwdb "$scsidev" udevadm test-builtin input_id /sys/class/net/$netdev udevadm test-builtin keyboard /dev/null # udevadm test-builtin kmod /sys/class/net/$netdev udevadm test-builtin uaccess /dev/null # udevadm test-builtin usb_id dev/null -(! udevadm test-builtin hello /sys/class/net/$netdev ) +(! udevadm test-builtin hello /sys/class/net/$netdev) +# systemd-hwdb update is extremely slow when combined with sanitizers and run +# in a VM without acceleration, so let's just skip the one particular test +# if we detect this combination +if ! [[ -v ASAN_OPTIONS && "$(systemd-detect-virt -v)" == "qemu" ]]; then + modprobe scsi_debug + scsidev=$(readlink -f /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/[0-9]*) + cat >/etc/udev/hwdb.d/99-test.hwdb <