From: Luca Boccassi Date: Thu, 14 Nov 2024 16:19:25 +0000 (+0000) Subject: test: skip TEST-84-STORAGETM if running with bugged libnvme X-Git-Tag: v257-rc2~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=893aa45886ef84b1827445dc438e410ad89fbbbf;p=thirdparty%2Fsystemd.git test: skip TEST-84-STORAGETM if running with bugged libnvme libnvme 1.11 appears to require a kernel built with NVME TLS kconfigs, and fails hard if it is not, as the expected privileged keyring '.nvme' is not present. We cannot just create it from userspace, as privileged keyrings can only be created by the kernel itself (those starting with '.'). Skip the test if the library exactly matches this version. https://github.com/linux-nvme/nvme-cli/issues/2573 Fixes https://github.com/systemd/systemd/issues/35130 --- diff --git a/test/units/TEST-84-STORAGETM.sh b/test/units/TEST-84-STORAGETM.sh index 1dd2ea61849..0020fad92aa 100755 --- a/test/units/TEST-84-STORAGETM.sh +++ b/test/units/TEST-84-STORAGETM.sh @@ -3,6 +3,14 @@ set -eux set -o pipefail +if systemd-analyze compare-versions "$(nvme --version | grep libnvme | awk '{print $3}')" eq 1.11; then + if grep -q "CONFIG_NVME_TCP_TLS is not set" "/boot/config-$(uname -r)" 2>/dev/null || grep -q "CONFIG_NVME_TCP_TLS is not set" "/usr/lib/modules/$(uname -r)/config" 2>/dev/null; then + # See: https://github.com/linux-nvme/nvme-cli/issues/2573 + echo "nvme-cli is broken and requires TLS support in the kernel" >/skipped + exit 77 + fi +fi + /usr/lib/systemd/systemd-storagetm --list-devices modprobe -v nvmet-tcp