From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 25 Aug 2022 12:23:49 +0000 (+0200)
Subject: test: require KVM only for specific sub-tests
X-Git-Tag: v252-rc1~326^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=092499b9f69b89f7afb392ddc733edb87e1503ca;p=thirdparty%2Fsystemd.git

test: require KVM only for specific sub-tests

since other sub-tests run relatively fine with TCG as well.
---

diff --git a/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh
index 36c2dcd51b9..80c60f19f7b 100755
--- a/test/TEST-64-UDEV-STORAGE/test.sh
+++ b/test/TEST-64-UDEV-STORAGE/test.sh
@@ -20,11 +20,6 @@ QEMU_TIMEOUT="${QEMU_TIMEOUT:-600}"
 USER_QEMU_OPTIONS="${QEMU_OPTIONS:-}"
 USER_KERNEL_APPEND="${KERNEL_APPEND:-}"
 
-if ! get_bool "$QEMU_KVM"; then
-    echo "This test requires KVM, skipping..."
-    exit 0
-fi
-
 _host_has_feature() {(
     set -e
 
@@ -213,6 +208,11 @@ testcase_nvme_basic() {
 
 # Test for issue https://github.com/systemd/systemd/issues/20212
 testcase_virtio_scsi_identically_named_partitions() {
+    if ! get_bool "$QEMU_KVM"; then
+        echo "This test requires KVM, skipping..."
+        return 77
+    fi
+
     if ! "${QEMU_BIN:?}" -device help | grep 'name "virtio-scsi-pci"'; then
         echo "virtio-scsi-pci device driver is not available, skipping test..."
         return 77